Only include build ID on monorepo builds.
This should fix https://github.com/flutter/flutter/issues/149780
Change-Id: I86c3400209ff93a3079442b70c90d6bd0d6fa8fd
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/58220
Commit-Queue: Jackson Gardner <jacksongardner@google.com>
Reviewed-by: Christopher Fujino <fujino@google.com>
diff --git a/recipe_modules/archives/api.py b/recipe_modules/archives/api.py
index 4d2b9df..b37e117 100644
--- a/recipe_modules/archives/api.py
+++ b/recipe_modules/archives/api.py
@@ -193,22 +193,21 @@
results = []
build_id = ''
realm = archive_config.get('realm', 'experimental').upper()
- # Weather to include build_id as part of the namespace or not.
- include_build_id = True
+ # Whether to include build_id as part of the namespace or not.
+ include_build_id = False
file_list = self._full_path_list(checkout, archive_config)
if self.m.monorepo.is_monorepo_try_build:
commit = self.m.monorepo.build_identifier
bucket = MONOREPO_TRY_BUCKET
+ include_build_id = True
elif self.m.monorepo.is_monorepo_ci_build:
commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
bucket = MONOREPO
+ include_build_id = True
else:
commit = self.m.repo_util.get_commit(checkout.join('flutter'))
bucket = self.m.buildbucket.build.builder.bucket
- if self.m.flutter_bcid.is_official_build():
- include_build_id = False
- elif self.m.flutter_bcid.is_prod_build() and realm == 'PRODUCTION':
- include_build_id = False
+ include_build_id = False
build_id = self.m.monorepo.build_identifier if include_build_id else ''
bucket_plus_realm = '_'.join(filter(None, (bucket, realm)))
for include_path in file_list:
@@ -263,26 +262,25 @@
"""
results = []
build_id = ''
+ include_build_id = False
# Calculate prefix and commit.
if self.m.monorepo.is_monorepo_try_build:
commit = self.m.monorepo.build_identifier
bucket = MONOREPO_TRY_BUCKET
+ include_build_id = True
elif self.m.monorepo.is_monorepo_ci_build:
commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
bucket = MONOREPO
+ include_build_id = True
else:
commit = self.m.repo_util.get_commit(checkout.join('flutter'))
bucket = self.m.buildbucket.build.builder.bucket
+ include_build_id = False
for archive in archives:
realm = archive.get('realm', 'experimental').upper()
bucket_plus_realm = '_'.join(filter(None, (bucket, realm)))
- include_build_id = True
- if self.m.flutter_bcid.is_official_build():
- include_build_id = False
- if self.m.flutter_bcid.is_prod_build() and realm == 'PRODUCTION':
- include_build_id = False
build_id = self.m.monorepo.build_identifier if include_build_id else ''
gcs_bucket, bucket_postfix = LUCI_TO_GCS_PREFIX.get(bucket_plus_realm)
source = checkout.join(archive.get('source'))
diff --git a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json
index be1d509..713a377 100644
--- a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json
+++ b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/prod_default_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json
index 2ff36ea..74d4752 100644
--- a/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json
+++ b/recipe_modules/archives/examples/engine_v2_gcs_paths.expected/try.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/engine_v2_gcs_paths.py b/recipe_modules/archives/examples/engine_v2_gcs_paths.py
index 33400a6..c39b57f 100644
--- a/recipe_modules/archives/examples/engine_v2_gcs_paths.py
+++ b/recipe_modules/archives/examples/engine_v2_gcs_paths.py
@@ -122,7 +122,7 @@
api.path['start_dir']
.join('out/android_profile/zip_archives/artifact1.zip')
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/artifact1.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/artifact1.zip'
),
ArchivePaths(
local=str(
@@ -130,7 +130,7 @@
'out/android_profile/zip_archives/android-arm-profile/artifacts.zip'
)
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip'
),
ArchivePaths(
local=str(
@@ -138,7 +138,7 @@
'out/android_profile/zip_archives/android-arm-profile/linux-x64.zip'
)
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip'
),
ArchivePaths(
local=str(
@@ -146,7 +146,7 @@
'out/android_profile/zip_archives/android-arm-profile/symbols.zip'
)
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip'
),
ArchivePaths(
local=str(
@@ -154,7 +154,7 @@
'out/android_profile/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar'
)
),
- remote='gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar'
+ remote='gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar'
),
ArchivePaths(
local=str(
@@ -162,14 +162,14 @@
'out/android_profile/zip_archives/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
)
),
- remote='gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+ remote='gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
),
ArchivePaths(
local=str(
api.path['start_dir']
.join('out/android_profile/zip_archives/sky_engine.zip')
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/sky_engine.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/sky_engine.zip'
)
]
expected_results = {
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
index 746977c..4e10356 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_experimental_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_experimental_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_experimental_realm.json
index d41e994..7bcc835 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_experimental_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_production_realm.json b/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_production_realm.json
index d41e994..7bcc835 100644
--- a/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/prod_pool_shadow_bucket_production_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
index ddda29f..b3c3631 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_experimental_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
index ddda29f..b3c3631 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_production_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_experimental_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_experimental_realm.json
index 26669a2..8119783 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_experimental_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_production_realm.json b/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_production_realm.json
index 26669a2..8119783 100644
--- a/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/staging_pool_shadow_bucket_production_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
index 5c4f8fa..44e2e02 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_experimental_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
index 5c4f8fa..44e2e02 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_production_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_experimental_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_experimental_realm.json
index d41e994..7bcc835 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_experimental_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_experimental_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_production_realm.json b/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_production_realm.json
index d41e994..7bcc835 100644
--- a/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_production_realm.json
+++ b/recipe_modules/archives/examples/full.expected/try_pool_shadow_bucket_production_realm.json
@@ -53,13 +53,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"cmd": [
"vpython3",
"-u",
@@ -69,7 +62,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -84,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure 98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -95,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -138,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil Upload [START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -152,7 +145,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip"
],
"infra_step": true,
@@ -168,7 +161,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil download gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "gsutil download gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"name": "$result"
diff --git a/recipe_modules/archives/examples/full.py b/recipe_modules/archives/examples/full.py
index 64bbdac..c4b4799 100644
--- a/recipe_modules/archives/examples/full.py
+++ b/recipe_modules/archives/examples/full.py
@@ -48,11 +48,11 @@
# Try LUCI pool with "production" realm in build configuration file.
try_pool_production_realm = [
- 'gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
- 'gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
- 'gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
- 'gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
- 'gs://flutter_archives_v2/98765/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
+ 'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip',
+ 'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/linux-x64.zip',
+ 'gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/symbols.zip',
+ 'gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.jar',
+ 'gs://flutter_archives_v2/download.flutter.io/io/flutter/x86_debug/1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584/x86_debug-1.0.0-0005149dca9b248663adcde4bdd7c6c915a76584.pom'
]
yield api.test(
'try_pool_production_realm',
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/prod.json b/recipe_modules/archives/examples/global_generator_paths.expected/prod.json
index 7a87e68..a884043 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/prod.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/prod.json
@@ -22,13 +22,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/global_generator_paths.expected/try.json b/recipe_modules/archives/examples/global_generator_paths.expected/try.json
index 8240515..e7514aa 100644
--- a/recipe_modules/archives/examples/global_generator_paths.expected/try.json
+++ b/recipe_modules/archives/examples/global_generator_paths.expected/try.json
@@ -22,27 +22,6 @@
"name": "git rev-parse"
},
{
- "cmd": [],
- "name": "get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get buildbucket id (2)",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get buildbucket id (3)",
- "~followup_annotations": [
- "@@@STEP_TEXT@98765@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/archives/examples/global_generator_paths.py b/recipe_modules/archives/examples/global_generator_paths.py
index aa68d0e..ce93de4 100644
--- a/recipe_modules/archives/examples/global_generator_paths.py
+++ b/recipe_modules/archives/examples/global_generator_paths.py
@@ -47,7 +47,7 @@
local=str(
api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
)
]
expected_results_flutter = [
@@ -110,20 +110,20 @@
expected_try_results = [
ArchivePaths(
local=str(api.path['start_dir'].join('src/out/debug/artifacts.zip')),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios/artifacts.zip'
),
ArchivePaths(
local=str(
api.path['start_dir']
.join('src/out/release-nobitcode/Flutter.dSYM.zip')
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release-nobitcode/Flutter.dSYM.zip'
),
ArchivePaths(
local=str(
api.path['start_dir'].join('src/out/release/Flutter.dSYM.zip')
),
- remote='gs://flutter_archives_v2/98765/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
+ remote='gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/ios-release/Flutter.dSYM.zip'
)
]
env_to_results = {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 69dd326..c6c852d 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -1637,14 +1637,6 @@
]
},
{
- "cmd": [],
- "name": "Global generators.get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@8945511751514863184@@@"
- ]
- },
- {
"cmd": [
"python3",
"RECIPE_MODULE[flutter::zip]/resources/namelist.py"
@@ -1680,7 +1672,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_3/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+ "[CLEANUP]/tmp_tmp_3/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
"luci_context": {
@@ -1695,7 +1687,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Ensure 8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
+ "name": "Global generators.Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1709,7 +1701,7 @@
"/path/to/tmp/json",
"copy",
"/a/b/c.txt",
- "[CLEANUP]/tmp_tmp_3/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+ "[CLEANUP]/tmp_tmp_3/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
"luci_context": {
@@ -1755,7 +1747,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+ "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index ede9705..5dd3b77 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -2090,14 +2090,6 @@
]
},
{
- "cmd": [],
- "name": "Global generators.get buildbucket id",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@8945511751514863184@@@"
- ]
- },
- {
"cmd": [
"git",
"rev-parse",
@@ -3419,7 +3411,7 @@
"ensure-directory",
"--mode",
"0o777",
- "[CLEANUP]/tmp_tmp_4/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+ "[CLEANUP]/tmp_tmp_4/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
"luci_context": {
@@ -3434,7 +3426,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Ensure 8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
+ "name": "Global generators.Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -3448,7 +3440,7 @@
"/path/to/tmp/json",
"copy",
"/a/b/c.txt",
- "[CLEANUP]/tmp_tmp_4/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
+ "[CLEANUP]/tmp_tmp_4/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket"
],
"infra_step": true,
"luci_context": {
@@ -3494,7 +3486,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/8945511751514863184/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
+ "name": "Global generators.gsutil Upload /a/b/c.txt to gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/bucket/c.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
