[build] Remove copy step for packages.tar.gz
As of fxrev.dev/1034936 we no longer generate packages.tar.gz, so we can
remove the copy step in this recipie.
Bug: 42077863
Change-Id: I5e14e3cf8852068a4b569a782bad78bad73032a8
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1036912
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
Fuchsia-Auto-Submit: Michael Brase <mbrase@google.com>
diff --git a/recipes/sdk.expected/release_with_companion_images.json b/recipes/sdk.expected/release_with_companion_images.json
index 03d3ed9..ad0ca77 100644
--- a/recipes/sdk.expected/release_with_companion_images.json
+++ b/recipes/sdk.expected/release_with_companion_images.json
@@ -2394,8 +2394,8 @@
"-o",
"GSUtil:software_update_check_period=0",
"cp",
- "gs://###BUCKET###/builds/9876543210/packages.tar.gz",
- "gs://fuchsia/development/0.20191018.0.1/packages/###OTHER_SDK_IMAGE###.tar.gz"
+ "gs://###BUCKET###/builds/123456789/build-archive.tgz",
+ "gs://fuchsia/development/0.20191018.0.1/images/###SDK_IMAGE###.tgz"
],
"infra_step": true,
"luci_context": {
@@ -2413,66 +2413,10 @@
"name": "relocate companion image archives.gsutil cp (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@###OTHER_SDK_IMAGE### packages@https://storage.cloud.google.com/fuchsia/development/0.20191018.0.1/packages/%23%23%23OTHER_SDK_IMAGE%23%23%23.tar.gz@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
- "-o",
- "GSUtil:software_update_check_period=0",
- "cp",
- "gs://###BUCKET###/builds/123456789/build-archive.tgz",
- "gs://fuchsia/development/0.20191018.0.1/images/###SDK_IMAGE###.tgz"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "fuchsia:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "relocate companion image archives.gsutil cp (3)",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LINK@###SDK_IMAGE### build-archive@https://storage.cloud.google.com/fuchsia/development/0.20191018.0.1/images/%23%23%23SDK_IMAGE%23%23%23.tgz@@@"
]
},
{
- "cmd": [
- "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
- "-o",
- "GSUtil:software_update_check_period=0",
- "cp",
- "gs://###BUCKET###/builds/123456789/packages.tar.gz",
- "gs://fuchsia/development/0.20191018.0.1/packages/###SDK_IMAGE###.tar.gz"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "fuchsia:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "relocate companion image archives.gsutil cp (4)",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@###SDK_IMAGE### packages@https://storage.cloud.google.com/fuchsia/development/0.20191018.0.1/packages/%23%23%23SDK_IMAGE%23%23%23.tar.gz@@@"
- ]
- },
- {
"cmd": [],
"name": "upload core SDK"
},
diff --git a/recipes/sdk.py b/recipes/sdk.py
index 144e730..8c494cd 100644
--- a/recipes/sdk.py
+++ b/recipes/sdk.py
@@ -470,13 +470,6 @@
dst=f"development/{sdk_id}/images/{image_name}.tgz",
link_name=f"{image_name} build-archive",
)
- api.gsutil.copy(
- src_bucket=src_bucket,
- src=f"builds/{b.build_proto.id}/packages.tar.gz",
- dst_bucket=props.gcs_bucket,
- dst=f"development/{sdk_id}/packages/{image_name}.tar.gz",
- link_name=f"{image_name} packages",
- )
return pbv2_path
