Remove support for building on the 1.4 branch on the bots.
We did not see any commits on this branch since May and 1.5 is going stable now.
Change-Id: I37b40183a67de772936be0a72bef980089be89d9
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index eda0964..10a7426 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -128,59 +128,6 @@
}
builders {
- name: "d8-linux-android-4.0.4_release"
- mixins: "linux"
- mixins: "normal"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:4.0.4"
- }
- }
- builders {
- name: "d8-linux-android-4.4.4_release"
- mixins: "linux"
- mixins: "normal"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:4.4.4"
- }
- }
- builders {
- name: "d8-linux-android-5.1.1_release"
- mixins: "linux"
- mixins: "normal"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:5.1.1"
- }
- }
- builders {
- name: "d8-linux-android-6.0.1_release"
- mixins: "linux"
- mixins: "normal"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:6.0.1"
- }
- }
- builders {
- name: "d8-linux-android-7.0.0_release"
- mixins: "linux"
- mixins: "normal"
- recipe {
- properties: "tool:d8"
- properties: "dex_vm:7.0.0"
- }
- }
- builders {
- name: "d8-linux_release"
- mixins: "linux"
- mixins: "normal"
- recipe {
- properties: "tool:d8"
- }
- }
- builders {
name: "linux"
mixins: "linux"
mixins: "normal"
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index a4ee962..42ee7f0 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -146,36 +146,6 @@
short_name: "jctf"
}
builders {
- name: "buildbucket/luci.r8.ci/d8-linux_release"
- category: "D8 release"
- short_name: "Linux"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-4.0.4_release"
- category: "D8 release"
- short_name: "4.0.4"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-4.4.4_release"
- category: "D8 release"
- short_name: "4.4.4"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-5.1.1_release"
- category: "D8 release"
- short_name: "5.1.1"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-6.0.1_release"
- category: "D8 release"
- short_name: "6.0.1"
- }
- builders {
- name: "buildbucket/luci.r8.ci/d8-linux-android-7.0.0_release"
- category: "D8 release"
- short_name: "7.0.0"
- }
- builders {
name: "buildbucket/luci.r8.ci/windows_release"
category: "win release"
short_name: "win"
diff --git a/infra/config/global/luci-notify.cfg b/infra/config/global/luci-notify.cfg
index dea08cd..a3dd898 100644
--- a/infra/config/global/luci-notify.cfg
+++ b/infra/config/global/luci-notify.cfg
@@ -24,36 +24,6 @@
repository: "https://r8.googlesource.com/r8"
}
builders {
- name: "d8-linux-android-4.0.4_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux-android-4.4.4_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux-android-5.1.1_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux-android-6.0.1_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux-android-7.0.0_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
- name: "d8-linux_release"
- bucket: "ci"
- repository: "https://r8.googlesource.com/r8"
- }
- builders {
name: "linux"
bucket: "ci"
repository: "https://r8.googlesource.com/r8"
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 8d26458..525bb2e 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -55,43 +55,17 @@
triggers: "linux-android-5.1.1_release"
triggers: "linux-android-6.0.1_release"
triggers: "linux-android-7.0.0_release"
- triggers: "linux-internal_release"
- triggers: "linux-jctf_release"
- triggers: "linux_release"
-}
-
-
-# The need for d8 specific bots was removed in 1.5, only trigger on 1.4.
-trigger {
- id: "1.4-branch-gitiles-trigger"
- acl_sets: "default"
- gitiles: {
- repo: "https://r8.googlesource.com/r8"
- refs: "regexp:refs/heads/d8.1.4"
- }
- triggers: "d8-linux-android-4.0.4_release"
- triggers: "d8-linux-android-4.4.4_release"
- triggers: "d8-linux-android-5.1.1_release"
- triggers: "d8-linux-android-6.0.1_release"
- triggers: "d8-linux-android-7.0.0_release"
- triggers: "d8-linux_release"
-}
-
-# These bots don't work until 1.5
-trigger {
- id: "1.5-branch-gitiles-trigger"
- acl_sets: "default"
- gitiles: {
- repo: "https://r8.googlesource.com/r8"
- refs: "regexp:refs/heads/d8.1.5"
- }
triggers: "linux-android-8.1.0_release"
triggers: "linux-android-9.0.0_release"
+ triggers: "linux-internal_release"
+ triggers: "linux-jctf_release"
triggers: "linux-run-on-as-app_release"
+ triggers: "linux_release"
triggers: "r8cf-linux-jctf_release"
triggers: "windows_release"
}
+
job {
id: "archive"
acl_sets: "default"
@@ -120,66 +94,6 @@
}
job {
- id: "d8-linux-android-4.0.4_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-4.0.4_release"
- }
-}
-
-job {
- id: "d8-linux-android-4.4.4_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-4.4.4_release"
- }
-}
-
-job {
- id: "d8-linux-android-5.1.1_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-5.1.1_release"
- }
-}
-
-job {
- id: "d8-linux-android-6.0.1_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-6.0.1_release"
- }
-}
-
-job {
- id: "d8-linux-android-7.0.0_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux-android-7.0.0_release"
- }
-}
-
-job {
- id: "d8-linux_release"
- acl_sets: "default"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "luci.r8.ci"
- builder: "d8-linux_release"
- }
-}
-
-job {
id: "linux"
acl_sets: "default"
triggering_policy: {
