Remove jctf test bots.
Change-Id: I28c101213f450987b783b718fe3c4b6703511eb2
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 67a2980..0323612 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -918,80 +918,6 @@
}
}
builders {
- name: "linux-d8_jctf"
- swarming_host: "chrome-swarming.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "jctf:true"
- dimensions: "os:Ubuntu-16.04"
- dimensions: "pool:luci.r8.ci"
- exe {
- cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
- cipd_version: "refs/heads/master"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "builder_group": "internal.client.r8",'
- ' "recipe": "rex",'
- ' "test_options": ['
- ' "--no_internal",'
- ' "--one_line_per_test",'
- ' "--archive_failures",'
- ' "--dex_vm=all",'
- ' "--tool=d8",'
- ' "--only_jctf"'
- ' ]'
- '}'
- priority: 26
- execution_timeout_secs: 43200
- expiration_secs: 126000
- build_numbers: YES
- service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
- name: "linux-d8_jctf_release"
- swarming_host: "chrome-swarming.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "jctf:true"
- dimensions: "os:Ubuntu-16.04"
- dimensions: "pool:luci.r8.ci"
- exe {
- cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
- cipd_version: "refs/heads/master"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "builder_group": "internal.client.r8",'
- ' "recipe": "rex",'
- ' "test_options": ['
- ' "--no_internal",'
- ' "--one_line_per_test",'
- ' "--archive_failures",'
- ' "--dex_vm=all",'
- ' "--tool=d8",'
- ' "--only_jctf"'
- ' ]'
- '}'
- priority: 26
- execution_timeout_secs: 43200
- expiration_secs: 126000
- build_numbers: YES
- service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "linux-dex_default"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -1564,80 +1490,6 @@
}
}
builders {
- name: "linux-r8cf_jctf"
- swarming_host: "chrome-swarming.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "jctf:true"
- dimensions: "os:Ubuntu-16.04"
- dimensions: "pool:luci.r8.ci"
- exe {
- cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
- cipd_version: "refs/heads/master"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "builder_group": "internal.client.r8",'
- ' "recipe": "rex",'
- ' "test_options": ['
- ' "--no_internal",'
- ' "--one_line_per_test",'
- ' "--archive_failures",'
- ' "--dex_vm=all",'
- ' "--tool=r8cf",'
- ' "--only_jctf"'
- ' ]'
- '}'
- priority: 26
- execution_timeout_secs: 43200
- expiration_secs: 126000
- build_numbers: YES
- service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
- name: "linux-r8cf_jctf_release"
- swarming_host: "chrome-swarming.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "jctf:true"
- dimensions: "os:Ubuntu-16.04"
- dimensions: "pool:luci.r8.ci"
- exe {
- cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
- cipd_version: "refs/heads/master"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "builder_group": "internal.client.r8",'
- ' "recipe": "rex",'
- ' "test_options": ['
- ' "--no_internal",'
- ' "--one_line_per_test",'
- ' "--archive_failures",'
- ' "--dex_vm=all",'
- ' "--tool=r8cf",'
- ' "--only_jctf"'
- ' ]'
- '}'
- priority: 26
- execution_timeout_secs: 43200
- expiration_secs: 126000
- build_numbers: YES
- service_account: "r8-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "linux-run-on-app-dump"
swarming_host: "chrome-swarming.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/global/generated/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg
index f8e60bd..e07a48e 100644
--- a/infra/config/global/generated/luci-milo.cfg
+++ b/infra/config/global/generated/luci-milo.cfg
@@ -121,16 +121,6 @@
short_name: "kotlin_old"
}
builders {
- name: "buildbucket/luci.r8.ci/linux-d8_jctf"
- category: "jctf"
- short_name: "d8_jctf"
- }
- builders {
- name: "buildbucket/luci.r8.ci/linux-r8cf_jctf"
- category: "jctf"
- short_name: "r8cf_jctf"
- }
- builders {
name: "buildbucket/luci.r8.ci/lib_desugar-archive"
category: "library_desugar"
short_name: "archive"
@@ -245,14 +235,4 @@
category: "Release|R8"
short_name: "dump"
}
- builders {
- name: "buildbucket/luci.r8.ci/linux-d8_jctf_release"
- category: "Release|jctf"
- short_name: "d8_jctf"
- }
- builders {
- name: "buildbucket/luci.r8.ci/linux-r8cf_jctf_release"
- category: "Release|jctf"
- short_name: "r8cf_jctf"
- }
}
diff --git a/infra/config/global/generated/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg
index 0240602..c9717b2 100644
--- a/infra/config/global/generated/luci-notify.cfg
+++ b/infra/config/global/generated/luci-notify.cfg
@@ -300,30 +300,6 @@
}
builders {
bucket: "ci"
- name: "linux-d8_jctf"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
- name: "linux-d8_jctf_release"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "linux-dex_default"
repository: "https://r8.googlesource.com/r8"
}
@@ -516,30 +492,6 @@
}
builders {
bucket: "ci"
- name: "linux-r8cf_jctf"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
- name: "linux-r8cf_jctf_release"
- repository: "https://r8.googlesource.com/r8"
- }
-}
-notifiers {
- notifications {
- on_failure: true
- on_new_failure: true
- notify_blamelist {}
- }
- builders {
- bucket: "ci"
name: "linux-run-on-app-dump"
repository: "https://r8.googlesource.com/r8"
}
diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index 0c8f47c..59bffec 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -368,35 +368,6 @@
}
}
job {
- id: "linux-d8_jctf"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 4
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "linux-d8_jctf"
- }
-}
-job {
- id: "linux-d8_jctf_release"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 4
- max_batch_size: 1
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "linux-d8_jctf_release"
- }
-}
-job {
id: "linux-dex_default"
realm: "ci"
acl_sets: "ci"
@@ -627,35 +598,6 @@
}
}
job {
- id: "linux-r8cf_jctf"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 4
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "linux-r8cf_jctf"
- }
-}
-job {
- id: "linux-r8cf_jctf_release"
- realm: "ci"
- acl_sets: "ci"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 4
- max_batch_size: 1
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "linux-r8cf_jctf_release"
- }
-}
-job {
id: "linux-run-on-app-dump"
realm: "ci"
acl_sets: "ci"
@@ -749,14 +691,12 @@
triggers: "linux-android-7.0.0_release"
triggers: "linux-android-8.1.0_release"
triggers: "linux-android-9.0.0_release"
- triggers: "linux-d8_jctf_release"
triggers: "linux-dex_default_release"
triggers: "linux-internal_release"
triggers: "linux-jdk11_release"
triggers: "linux-jdk8_release"
triggers: "linux-jdk9_release"
triggers: "linux-none_release"
- triggers: "linux-r8cf_jctf_release"
triggers: "linux-run-on-app-dump_release"
triggers: "windows_release"
gitiles {
@@ -782,7 +722,6 @@
triggers: "linux-android-7.0.0"
triggers: "linux-android-8.1.0"
triggers: "linux-android-9.0.0"
- triggers: "linux-d8_jctf"
triggers: "linux-dex_default"
triggers: "linux-internal"
triggers: "linux-jdk11"
@@ -792,7 +731,6 @@
triggers: "linux-kotlin_dev"
triggers: "linux-kotlin_old"
triggers: "linux-none"
- triggers: "linux-r8cf_jctf"
triggers: "linux-run-on-app-dump"
triggers: "windows"
gitiles {
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index ff709b5..61677b9 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -161,7 +161,7 @@
"--archive_failures"
]
-def get_dimensions(windows=False, jctf=False, internal=False, normal=False):
+def get_dimensions(windows=False, internal=False, normal=False):
dimensions = {
"cores" : "2" if internal else "8",
"cpu" : "x86-64",
@@ -171,8 +171,6 @@
dimensions["os"] = "Windows-10"
else:
dimensions["os"] = "Ubuntu-16.04"
- if jctf:
- dimensions["jctf"] = "true"
if internal:
dimensions["internal"] = "true"
if normal:
@@ -385,38 +383,12 @@
}
)
-def jctf():
- for release in ["", "_release"]:
- for tool in ["d8", "r8cf"]:
- properties = {
- "test_options" : [
- "--no_internal",
- "--one_line_per_test",
- "--archive_failures",
- "--dex_vm=all",
- "--tool=" + tool,
- "--only_jctf"],
- "builder_group" : "internal.client.r8",
- }
- name = "linux-" + tool + "_jctf" + release
- r8_builder(
- name,
- category = "jctf",
- dimensions = get_dimensions(jctf=True),
- execution_timeout = time.hour * 12,
- expiration_timeout = time.hour * 35,
- properties = properties,
- )
-jctf()
-
order_of_categories = [
"archive",
"R8",
- "jctf",
"library_desugar",
"Release|archive",
"Release|R8",
- "Release|jctf"
]
def add_view_entries():
