test(bigtable): alter keyring location for tests. bigtable requires s… (

googleapis#4205) …pecific locations for CMEK
cbozen · Jun 3, 2021 · fdf29be · fdf29be
1 parent 57b3879
commit fdf29be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bigtable/integration_test.go b/bigtable/integration_test.go
@@ -1573,9 +1573,13 @@ func TestIntegration_AdminEncryptionInfo(t *testing.T) {
 	table := instanceToCreate + "-table"
 	clusterID := instanceToCreate + "-cluster"
 
-	keyRingName := os.Getenv("GCLOUD_TESTS_GOLANG_KEYRING")
+	keyRingName := os.Getenv("GCLOUD_TESTS_BIGTABLE_KEYRING")
 	if keyRingName == "" {
-		t.Fatal("GCLOUD_TESTS_GOLANG_KEYRING must be set. See CONTRIBUTING.md for details")
+		// try to fall back on GOLANG keyring
+		keyRingName = os.Getenv("GCLOUD_TESTS_GOLANG_KEYRING")
+		if keyRingName == "" {
+			t.Fatal("GCLOUD_TESTS_BIGTABLE_KEYRING or GCLOUD_TESTS_GOLANG_KEYRING must be set. See CONTRIBUTING.md for details")
+		}
 	}
 	kmsKeyName := keyRingName + "/cryptoKeys/key1"
 

diff --git a/internal/kokoro/continuous.sh b/internal/kokoro/continuous.sh
@@ -38,7 +38,7 @@ export GCLOUD_TESTS_GOLANG_KEYRING=projects/dulcet-port-762/locations/us/keyRing
 export GCLOUD_TESTS_GOLANG_PROFILER_ZONE="us-west1-b"
 
 # Bigtable integration tests expect an existing instance and cluster
-#  ❯ cbt createinstance gcloud-bt-it-tests-instance "Bigtable IT Instance" \
+#  ❯ cbt createinstance gcloud-bt-it-tests-instance gcloud-bt-it-tests-instance \
 #    gcloud-bt-it-tests-cluster us-west1-b 1 SSD
 export GCLOUD_TESTS_BIGTABLE_KEYRING=projects/dulcet-port-762/locations/us-central1/keyRings/go-integration-test
 export GCLOUD_TESTS_BIGTABLE_CLUSTER="gcloud-bt-it-tests-cluster"