From 02fc8673d093b1b76f33cbd7334d248bf3a05773 Mon Sep 17 00:00:00 2001 From: Zhenhua Li Date: Mon, 29 Apr 2024 14:36:07 -0700 Subject: [PATCH] Revert "Set environment variable for tpu v2 vm (#9788)" (#10555) --- .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 - .ci/magician/cmd/test_terraform_vcr.go | 1 - 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.ci/gcb-generate-diffs-new.yml b/.ci/gcb-generate-diffs-new.yml index 620645e69411..34d8c4ecd970 100644 --- a/.ci/gcb-generate-diffs-new.yml +++ b/.ci/gcb-generate-diffs-new.yml @@ -255,7 +255,7 @@ steps: - name: 'gcr.io/graphite-docker-images/go-plus' id: gcb-tpg-vcr-test entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' - secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS", "GITHUB_TOKEN_MAGIC_MODULES", "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"] + secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS", "GITHUB_TOKEN_MAGIC_MODULES", "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"] waitFor: ["diff"] env: - BASE_BRANCH=$_BASE_BRANCH @@ -318,5 +318,3 @@ 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 9188e749a00d..e351011f9f2b 100644 --- a/.ci/gcb-push-downstream.yml +++ b/.ci/gcb-push-downstream.yml @@ -206,7 +206,6 @@ 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" @@ -253,5 +252,3 @@ 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 3664d6312d34..ee48902cb8c5 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: ["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"] + secretEnv: ["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"] args: - $BUILD_ID @@ -41,5 +41,3 @@ 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/magician/cmd/check_cassettes.go b/.ci/magician/cmd/check_cassettes.go index d31cebe44ddd..e19f3f7c9ef3 100644 --- a/.ci/magician/cmd/check_cassettes.go +++ b/.ci/magician/cmd/check_cassettes.go @@ -28,7 +28,6 @@ var ccEnvironmentVariables = [...]string{ "GOOGLE_REGION", "GOOGLE_SERVICE_ACCOUNT", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION", - "GOOGLE_TPU_V2_VM_RUNTIME_VERSION", "GOOGLE_ZONE", "PATH", "SA_KEY", diff --git a/.ci/magician/cmd/test_terraform_vcr.go b/.ci/magician/cmd/test_terraform_vcr.go index c3e0b54037be..74a37c5bbe12 100644 --- a/.ci/magician/cmd/test_terraform_vcr.go +++ b/.ci/magician/cmd/test_terraform_vcr.go @@ -30,7 +30,6 @@ var ttvEnvironmentVariables = [...]string{ "GOOGLE_REGION", "GOOGLE_SERVICE_ACCOUNT", "GOOGLE_PUBLIC_AVERTISED_PREFIX_DESCRIPTION", - "GOOGLE_TPU_V2_VM_RUNTIME_VERSION", "GOOGLE_ZONE", "HOME", "PATH",