From edc7f82ada529bff55abc1c6a8d0eb4670e029f1 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Fri, 12 Jan 2024 12:28:29 -0800 Subject: [PATCH] Set environment variable for tpu v2 vm (#9788) --- .ci/gcb-generate-diffs-new.yml | 4 +++- .ci/gcb-push-downstream.yml | 3 +++ .ci/gcb-vcr-nightly.yml | 4 +++- .ci/magician/cmd/check_cassettes.go | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.ci/gcb-generate-diffs-new.yml b/.ci/gcb-generate-diffs-new.yml index 0e4035976fe1..fe51bf87f418 100644 --- a/.ci/gcb-generate-diffs-new.yml +++ b/.ci/gcb-generate-diffs-new.yml @@ -241,7 +241,7 @@ steps: - name: 'gcr.io/graphite-docker-images/go-plus' id: gcb-tpg-vcr-test entrypoint: '/workspace/.ci/scripts/go-plus/gcb-terraform-vcr-tester/test_terraform_vcr.sh' - secretEnv: ["GITHUB_TOKEN", "GOOGLE_BILLING_ACCOUNT", "GOOGLE_CUST_ID", "GOOGLE_FIRESTORE_PROJECT", "GOOGLE_IDENTITY_USER", "GOOGLE_MASTER_BILLING_ACCOUNT", "GOOGLE_ORG", "GOOGLE_ORG_2", "GOOGLE_ORG_DOMAIN", "GOOGLE_PROJECT", "GOOGLE_PROJECT_NUMBER", "GOOGLE_SERVICE_ACCOUNT", "SA_KEY", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION"] + secretEnv: ["GITHUB_TOKEN", "GOOGLE_BILLING_ACCOUNT", "GOOGLE_CUST_ID", "GOOGLE_FIRESTORE_PROJECT", "GOOGLE_IDENTITY_USER", "GOOGLE_MASTER_BILLING_ACCOUNT", "GOOGLE_ORG", "GOOGLE_ORG_2", "GOOGLE_ORG_DOMAIN", "GOOGLE_PROJECT", "GOOGLE_PROJECT_NUMBER", "GOOGLE_SERVICE_ACCOUNT", "SA_KEY", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION", "GOOGLE_TPU_V2_VM_RUNTIME_VERSION"] waitFor: ["diff"] env: - BASE_BRANCH=$_BASE_BRANCH @@ -295,3 +295,5 @@ availableSecrets: env: SA_KEY - versionName: projects/673497134629/secrets/ci-test-public-advertised-prefix-description/versions/latest env: GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION + - versionName: projects/673497134629/secrets/ci-test-tpu-v2-vm-runtime-version/versions/latest + env: GOOGLE_TPU_V2_VM_RUNTIME_VERSION diff --git a/.ci/gcb-push-downstream.yml b/.ci/gcb-push-downstream.yml index 6d674a6b9b96..a11586ab8e29 100644 --- a/.ci/gcb-push-downstream.yml +++ b/.ci/gcb-push-downstream.yml @@ -201,6 +201,7 @@ steps: - "GOOGLE_SERVICE_ACCOUNT" - "SA_KEY" - "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION" + - "GOOGLE_TPU_V2_VM_RUNTIME_VERSION" env: - "COMMIT_SHA=$COMMIT_SHA" - "GOOGLE_REGION=us-central1" @@ -245,3 +246,5 @@ availableSecrets: env: SA_KEY - versionName: projects/673497134629/secrets/ci-test-public-advertised-prefix-description/versions/latest env: GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION + - versionName: projects/673497134629/secrets/ci-test-tpu-v2-vm-runtime-version/versions/latest + env: GOOGLE_TPU_V2_VM_RUNTIME_VERSION diff --git a/.ci/gcb-vcr-nightly.yml b/.ci/gcb-vcr-nightly.yml index 679476ef43dd..5906d404d11f 100644 --- a/.ci/gcb-vcr-nightly.yml +++ b/.ci/gcb-vcr-nightly.yml @@ -3,7 +3,7 @@ steps: - name: 'gcr.io/graphite-docker-images/go-plus' id: gcb-vcr-nightly entrypoint: '/workspace/.ci/scripts/go-plus/vcr-cassette-update/vcr_cassette_update.sh' - secretEnv: ["GITHUB_TOKEN", "GOOGLE_BILLING_ACCOUNT", "GOOGLE_CUST_ID", "GOOGLE_FIRESTORE_PROJECT", "GOOGLE_IDENTITY_USER", "GOOGLE_MASTER_BILLING_ACCOUNT", "GOOGLE_ORG", "GOOGLE_ORG_2", "GOOGLE_ORG_DOMAIN", "GOOGLE_PROJECT", "GOOGLE_PROJECT_NUMBER", "GOOGLE_SERVICE_ACCOUNT", "SA_KEY", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION"] + secretEnv: ["GITHUB_TOKEN", "GOOGLE_BILLING_ACCOUNT", "GOOGLE_CUST_ID", "GOOGLE_FIRESTORE_PROJECT", "GOOGLE_IDENTITY_USER", "GOOGLE_MASTER_BILLING_ACCOUNT", "GOOGLE_ORG", "GOOGLE_ORG_2", "GOOGLE_ORG_DOMAIN", "GOOGLE_PROJECT", "GOOGLE_PROJECT_NUMBER", "GOOGLE_SERVICE_ACCOUNT", "SA_KEY", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION", "GOOGLE_TPU_V2_VM_RUNTIME_VERSION"] args: - $BUILD_ID @@ -43,3 +43,5 @@ availableSecrets: env: SA_KEY - versionName: projects/673497134629/secrets/ci-test-public-advertised-prefix-description/versions/latest env: GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION + - versionName: projects/673497134629/secrets/ci-test-tpu-v2-vm-runtime-version/versions/latest + env: GOOGLE_TPU_V2_VM_RUNTIME_VERSION \ No newline at end of file diff --git a/.ci/magician/cmd/check_cassettes.go b/.ci/magician/cmd/check_cassettes.go index 84c72d835df2..f6a14ef2c74b 100644 --- a/.ci/magician/cmd/check_cassettes.go +++ b/.ci/magician/cmd/check_cassettes.go @@ -29,6 +29,7 @@ var environmentVariables = [...]string{ "GOOGLE_REGION", "GOOGLE_SERVICE_ACCOUNT", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION", + "GOOGLE_TPU_V2_VM_RUNTIME_VERSION", "GOOGLE_ZONE", "PATH", "SA_KEY",