Move archiving to new bots
Bug: 124643718
Change-Id: I2837e068fa3afef2e4c48dd60beb0b0febd48be4
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index d91254f..0136562 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -87,8 +87,7 @@
name: "archive"
mixins: "linux"
recipe {
- # TODO(ricow): set archive flag when we flip over
- # properties: "archive:True"
+ properties: "archive:True"
}
}
builders {
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 0d30703..7c867e5 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -40,9 +40,9 @@
triggers: "linux-android-6.0.1"
triggers: "linux-android-7.0.0"
triggers: "windows"
+ triggers: "archive"
# TODO(ricow): enable remaining
- # triggers: "archive"
# triggers: "linux-internal"
# triggers: "linux-jctf"
# triggers: "r8cf-linux-jctf"
diff --git a/tools/archive.py b/tools/archive.py
index 9de199c..833b4b0 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -94,6 +94,11 @@
if not utils.is_bot() and not options.dry_run:
raise Exception('You are not a bot, don\'t archive builds')
+ if utils.is_old_bot():
+ print("Archiving is disabled on old bots, new bots are archiving, see " +
+ "https://ci.chromium.org/p/r8")
+ return
+
# Create maven release which uses a build that exclude dependencies.
create_maven_release.main(["--out", utils.LIBS])
diff --git a/tools/utils.py b/tools/utils.py
index f6e0a70..2b0caaf 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -481,11 +481,11 @@
android_optional_jar for android_optional_jar in android_optional_jars
if os.path.isfile(android_optional_jar)]
-def is_bot():
+def is_old_bot():
return 'BUILDBOT_BUILDERNAME' in os.environ
+def is_bot():
+ return 'USER' in os.environ and os.environ['USER'] == 'chrome-bot'
def uncompressed_size(path):
return sum(z.file_size for z in zipfile.ZipFile(path).infolist())
-
-
