diff --git a/release/cloudbuild-nomulus.yaml b/release/cloudbuild-nomulus.yaml index dc38dbc3941..54e748030fe 100644 --- a/release/cloudbuild-nomulus.yaml +++ b/release/cloudbuild-nomulus.yaml @@ -203,7 +203,7 @@ steps: --images="gcr.io/${PROJECT_ID}/nomulus=gcr.io/${PROJECT_ID}/nomulus@${nomulus_digest}" \ --source=. \ --skaffold-file=release/clouddeploy/skaffold.yaml \ - --deploy-parameters="deployed_image=gcr.io/${PROJECT_ID}/nomulus@${nomulus_digest},base_image=us-docker.pkg.dev/${PROJECT_ID}/gcr.io/nomulus" + --deploy-parameters="deployed_image=gcr.io/${PROJECT_ID}/nomulus@${nomulus_digest},base_image=us-docker.pkg.dev/${PROJECT_ID}/gcr.io/nomulus,tag_name=${TAG_NAME},project_id=${PROJECT_ID}" # The tarballs and jars to upload to GCS. artifacts: objects: diff --git a/release/clouddeploy/delivery-pipeline.yaml b/release/clouddeploy/delivery-pipeline.yaml index b899be95dfd..b4b698aee94 100644 --- a/release/clouddeploy/delivery-pipeline.yaml +++ b/release/clouddeploy/delivery-pipeline.yaml @@ -20,11 +20,14 @@ serialPipeline: image: gcr.io/google.com/cloudsdktool/google-cloud-cli:stable env: TARGET_ID: ${{ target.id }} + TAG_NAME: ${{ deploy_params['tag_name'] }} + PROJECT_ID: ${{ deploy_params['project_id'] }} command: ["/bin/bash"] args: - "-c" - | - gcloud builds submit --config=release/cloudbuild-schema-verify-${TARGET_ID}.yaml + gcloud storage cp gs://${PROJECT_ID}-deploy/${TAG_NAME}/cloudbuild-schema-verify-${TARGET_ID}.yaml . + gcloud builds submit --no-source --config=cloudbuild-schema-verify-${TARGET_ID}.yaml analysis: # 10 minutes. duration: 600s @@ -61,11 +64,14 @@ serialPipeline: image: gcr.io/google.com/cloudsdktool/google-cloud-cli:stable env: TARGET_ID: ${{ target.id }} + TAG_NAME: ${{ deploy_params['tag_name'] }} + PROJECT_ID: ${{ deploy_params['project_id'] }} command: ["/bin/bash"] args: - "-c" - | - gcloud builds submit --config=release/cloudbuild-schema-deploy-${TARGET_ID}.yaml + gcloud storage cp gs://${PROJECT_ID}-deploy/${TAG_NAME}/cloudbuild-schema-deploy-${TARGET_ID}.yaml . + gcloud builds submit --no-source --config=cloudbuild-schema-deploy-${TARGET_ID}.yaml analysis: # 10 minutes. duration: 600s @@ -86,11 +92,14 @@ serialPipeline: image: gcr.io/google.com/cloudsdktool/google-cloud-cli:stable env: TARGET_ID: ${{ target.id }} + TAG_NAME: ${{ deploy_params['tag_name'] }} + PROJECT_ID: ${{ deploy_params['project_id'] }} command: ["/bin/bash"] args: - "-c" - | - gcloud builds submit --config=release/cloudbuild-schema-verify-${TARGET_ID}.yaml + gcloud storage cp gs://${PROJECT_ID}-deploy/${TAG_NAME}/cloudbuild-schema-verify-${TARGET_ID}.yaml . + gcloud builds submit --no-source --config=cloudbuild-schema-verify-${TARGET_ID}.yaml analysis: # 10 minutes. duration: 600s @@ -127,11 +136,14 @@ serialPipeline: image: gcr.io/google.com/cloudsdktool/google-cloud-cli:stable env: TARGET_ID: ${{ target.id }} + TAG_NAME: ${{ deploy_params['tag_name'] }} + PROJECT_ID: ${{ deploy_params['project_id'] }} command: ["/bin/bash"] args: - "-c" - | - gcloud builds submit --config=release/cloudbuild-schema-deploy-${TARGET_ID}.yaml + gcloud storage cp gs://${PROJECT_ID}-deploy/${TAG_NAME}/cloudbuild-schema-deploy-${TARGET_ID}.yaml . + gcloud builds submit --no-source --config=cloudbuild-schema-deploy-${TARGET_ID}.yaml analysis: # 10 minutes. duration: 600s