Add tags to sub cloudbuild

Signed-off-by: Jiankun Lu <[email protected]>
google · Jul 2, 2024 · f4641ad · f4641ad
1 parent 6a70865
commit f4641ad
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/launcher/image/cloudbuild.yaml b/launcher/image/cloudbuild.yaml
@@ -52,6 +52,6 @@ steps:
            '-project=${PROJECT_ID}']
 
 timeout: '3000s'
-
+tags: ['${_SHORT_SHA}']
 options:
   dynamic_substitutions: true
diff --git a/launcher/image/test/test_discover_signatures.yaml b/launcher/image/test/test_discover_signatures.yaml
@@ -1,7 +1,7 @@
 substitutions:
   '_IMAGE_NAME': ''
   '_IMAGE_PROJECT': ''
-  '_CLEANUP': 'true'
+  '_CLEANUP': 'false'
   '_VM_NAME_PREFIX': 'discover-signatures'
   '_ZONE': 'us-west1-a'
   '_WORKLOAD_IMAGE': 'us-west1-docker.pkg.dev/confidential-space-images-dev/cs-integ-test-images/basic-test:latest'

diff --git a/launcher/image/test/test_hardened_cloudbuild.yaml b/launcher/image/test/test_hardened_cloudbuild.yaml
@@ -5,7 +5,7 @@ substitutions:
   '_IMAGE_PROJECT': ''
   # Add user-data in the metadata to test if it is disabled.
   '_METADATA_FILE': 'startup-script=data/echo_startupscript.sh,user-data=data/cloud-init-config.yaml'
-  '_CLEANUP': 'true'
+  '_CLEANUP': 'false'
   '_VM_NAME_PREFIX': 'cs-hardened-test'
   '_ZONE': 'us-west1-a'
   '_WORKLOAD_IMAGE': 'us-west1-docker.pkg.dev/confidential-space-images-dev/cs-integ-test-images/basic-test:latest'

diff --git a/launcher/image/test/test_ingress_network.yaml b/launcher/image/test/test_ingress_network.yaml
@@ -3,7 +3,7 @@
 substitutions:
   '_IMAGE_NAME': ''
   '_IMAGE_PROJECT': ''
-  '_CLEANUP': 'true'
+  '_CLEANUP': 'false'
   '_ZONE': 'asia-east1-a'
   '_WORKLOAD_IMAGE': 'docker.io/library/nginx:latest'
 
@@ -19,7 +19,7 @@ steps:
             '-n', 'ingress-network-test-${BUILD_ID}',
             '-z', '${_ZONE}',
           ]
-    
+
   - name: 'gcr.io/cloud-builders/gcloud'
     id: CheckReachability
     waitFor: ['CreateServerWorkload']

diff --git a/launcher/image/test/test_log_redirection.yaml b/launcher/image/test/test_log_redirection.yaml
@@ -1,7 +1,7 @@
 substitutions:
   '_HARDENED_IMAGE_NAME': ''
   '_IMAGE_PROJECT': ''
-  '_CLEANUP': 'true'
+  '_CLEANUP': 'false'
   '_VM_NAME_PREFIX': 'cs-logredirect-test'
   '_ZONE': 'us-central1-a'
   '_WORKLOAD_IMAGE': 'us-west1-docker.pkg.dev/confidential-space-images-dev/cs-integ-test-images/basic_test:latest'

diff --git a/launcher/image/test/test_memory_monitoring.yaml b/launcher/image/test/test_memory_monitoring.yaml
@@ -1,7 +1,7 @@
 substitutions:
   '_IMAGE_NAME': ''
   '_IMAGE_PROJECT': ''
-  '_CLEANUP': 'true'
+  '_CLEANUP': 'false'
   '_VM_NAME_PREFIX': 'memory-monitoring'
   '_ZONE': 'us-west1-a'
   '_WORKLOAD_IMAGE': 'us-west1-docker.pkg.dev/confidential-space-images-dev/cs-integ-test-images/memorymonitoring:latest'

diff --git a/launcher/image/test/test_oda_with_signed_container.yaml b/launcher/image/test/test_oda_with_signed_container.yaml
@@ -1,7 +1,7 @@
 substitutions:
   '_IMAGE_NAME': ''
   '_IMAGE_PROJECT': ''
-  '_CLEANUP': 'true'
+  '_CLEANUP': 'false'
   '_VM_NAME_PREFIX': 'oda-signedcontainer'
   '_ZONE': 'us-east1-b'
   # If the workload image changes, the commit author should change the cosign signature as well to not break tests.