Move archive bot to specify script and options
Bug: 201375599
Change-Id: If6bbe84350f0aa99d5fde4b5fb76004059ebd57a
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index d91527f..8d83b0c 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -30,8 +30,9 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
- properties_j: "archive:\"true\""
properties_j: "builder_group:\"internal.client.r8\""
+ properties_j: "test_options:[]"
+ properties_j: "test_wrapper:\"tools/archive.py\""
}
priority: 25
execution_timeout_secs: 1800
@@ -55,8 +56,9 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
- properties_j: "archive:\"true\""
properties_j: "builder_group:\"internal.client.r8\""
+ properties_j: "test_options:[]"
+ properties_j: "test_wrapper:\"tools/archive.py\""
}
priority: 25
execution_timeout_secs: 1800
@@ -130,9 +132,9 @@
name: "rex"
cipd_package: "infra_internal/recipe_bundles/chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave"
cipd_version: "refs/heads/master"
- properties_j: "archive:\"true\""
properties_j: "builder_group:\"internal.client.r8\""
- properties_j: "sdk_desugar:\"true\""
+ properties_j: "test_options:[]"
+ properties_j: "test_wrapper:\"tools/archive_desugar_jdk_libs.py\""
}
priority: 25
execution_timeout_secs: 3600
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index bb9771e..e3c76ba 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -212,11 +212,11 @@
for name in ["archive", "archive_release", "lib_desugar-archive"]:
desugar = "desugar" in name
properties = {
- "archive": "true",
+ "test_wrapper" : "tools/archive_desugar_jdk_libs.py" if desugar else "tools/archive.py",
+ # TODO(b/201375599): remove after cleanup (allow only setting test_wrapper)
+ "test_options" : [],
"builder_group" : "internal.client.r8"
}
- if desugar:
- properties["sdk_desugar"] = "true"
r8_builder(
name,
category = "library_desugar" if desugar else "archive",
