From 41548ae6625e26496fec7a3d0a31231ece26f965 Mon Sep 17 00:00:00 2001
From: Brian Ting <brianting@google.com>
Date: Thu, 30 Jan 2025 17:29:43 -0800
Subject: [PATCH 1/2] Rename archives and base dirs to <platform_config>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… same as package dirs but departing from Chromium's scheme.

Issue: 365150653
Issue: 393447640
Reviewed-on: https://github.com/youtube/cobalt/pull/4816
---
 cobalt/devinfra/kokoro/bin/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cobalt/devinfra/kokoro/bin/common.sh b/cobalt/devinfra/kokoro/bin/common.sh
index 691695bcba5..1b9c108124d 100755
--- a/cobalt/devinfra/kokoro/bin/common.sh
+++ b/cobalt/devinfra/kokoro/bin/common.sh
@@ -283,7 +283,7 @@ run_package_release_pipeline () {
     export PYTHONPATH="${WORKSPACE_COBALT}"
     if [[ "${PLATFORM}" =~ "android" ]]; then
       python3 "${WORKSPACE_COBALT}/cobalt/build/android/package.py" \
-        --name=cobalt-android "${out_dir}" "${package_dir}"
+        --name="${PLATFORM}_${CONFIG}" "${out_dir}" "${package_dir}"
     elif [[ "${PLATFORM}" =~ "evergreen" ]]; then
       local bootloader_out_dir=
       if [ -n "${BOOTLOADER:-}" ]; then
@@ -296,7 +296,7 @@ run_package_release_pipeline () {
         "${bootloader_out_dir:-}"
     else
       python3 "${WORKSPACE_COBALT}/cobalt/build/linux/package.py" \
-        --name=cobalt-linux "${out_dir}" "${package_dir}"
+        --name="${PLATFORM}_${CONFIG}" "${out_dir}" "${package_dir}"
     fi
 
     # Create and upload nightly archive.

From 5c9dc2402e31a748fabd7eb55b78995719b70692 Mon Sep 17 00:00:00 2001
From: Brian Ting <brianting@google.com>
Date: Thu, 30 Jan 2025 17:29:43 -0800
Subject: [PATCH 2/2] Don't copy package_dir name under gcs_archive_path

Issue: 365150653
Issue: 393447640
Reviewed-on: https://github.com/youtube/cobalt/pull/4816
---
 cobalt/devinfra/kokoro/bin/common.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cobalt/devinfra/kokoro/bin/common.sh b/cobalt/devinfra/kokoro/bin/common.sh
index 1b9c108124d..306c6e4edd2 100755
--- a/cobalt/devinfra/kokoro/bin/common.sh
+++ b/cobalt/devinfra/kokoro/bin/common.sh
@@ -258,7 +258,8 @@ create_and_upload_nightly_archive () {
 
   init_gcloud
 
-  "${GSUTIL}" cp -r "${package_dir}" "${gcs_archive_path}"
+  # Copy everything in package_dir but not its last path segment; gcs_archive_path already exists.
+  "${GSUTIL}" cp -r "${package_dir}/." "${gcs_archive_path}"
 }
 
 run_package_release_pipeline () {