wip

Author: parthea

packages/google-cloud-storage/cloudbuild/zb-system-tests-cloudbuild.yaml

@@ -8,21 +8,6 @@ substitutions:
 
 
 steps:
-  # Step 0: Generate a persistent SSH key for this build run.
-  # This prevents gcloud from adding a new key to the OS Login profile on every ssh/scp command.
-  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
-    id: "generate-ssh-key"
-    entrypoint: "bash"
-    args:
-      - "-c"
-      - |
-        mkdir -p /workspace/.ssh
-        # Generate the SSH key
-        ssh-keygen -t rsa -f /workspace/.ssh/google_compute_engine -N '' -C gcb
-        # Save the public key content to a file for the cleanup step
-        cat /workspace/.ssh/google_compute_engine.pub > /workspace/gcb_ssh_key.pub
-    waitFor: ["-"]
-
   - name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
     id: "cleanup-old-keys"
     entrypoint: "bash"
@@ -57,6 +42,24 @@ steps:
 
         echo "---------------------------------------------------------------------"
         echo "Cleanup complete."
+    waitFor: ["-"]
+
+  # Step 0: Generate a persistent SSH key for this build run.
+  # This prevents gcloud from adding a new key to the OS Login profile on every ssh/scp command.
+  - name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
+    id: "generate-ssh-key"
+    entrypoint: "bash"
+    args:
+      - "-c"
+      - |
+        mkdir -p /workspace/.ssh
+        # Generate the SSH key
+        ssh-keygen -t rsa -f /workspace/.ssh/google_compute_engine -N '' -C gcb
+        # Save the public key content to a file for the cleanup step
+        cat /workspace/.ssh/google_compute_engine.pub > /workspace/gcb_ssh_key.pub
+        # Register the key with OS Login
+        gcloud compute os-login ssh-keys add --key-file=/workspace/.ssh/google_compute_engine.pub
+    waitFor: ["cleanup-old-keys"]
 
   # Step 1 Create a GCE VM to run the tests.
   # The VM is created in the same zone as the buckets to test rapid storage features.
@@ -77,7 +80,7 @@ steps:
       - "--service-account=${_ZONAL_VM_SERVICE_ACCOUNT}"
       - "--scopes=https://www.googleapis.com/auth/devstorage.full_control,https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/devstorage.read_write,https://www.googleapis.com/auth/cloudkms"
       - "--metadata=enable-oslogin=TRUE"
-    waitFor: ["-"]
+    waitFor: ["cleanup-old-keys"]
 
   # Step 2: Run the integration tests inside the newly created VM and cleanup.
   # This step uses 'gcloud compute ssh' to execute a remote script.
@@ -115,7 +118,6 @@ steps:
     waitFor:
       - "create-vm"
       - "generate-ssh-key"
-      - "cleanup-old-keys"
 
   - name: "gcr.io/google.com/cloudsdktool/cloud-sdk"
     id: "cleanup-ssh-key"