Skip to content

Commit f184012

Browse files
chore: use zones that are available in all test envs (#78)
* chore: use zones that are available in all test envs * format
1 parent f201997 commit f184012

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableInstanceAdminClientIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public void instanceCreationDeletionTest() {
117117

118118
client.createInstance(
119119
CreateInstanceRequest.of(newInstanceId)
120-
.addDevelopmentCluster(newClusterId, "us-east1-b", StorageType.SSD)
120+
.addDevelopmentCluster(
121+
newClusterId, testEnvRule.env().getPrimaryZone(), StorageType.SSD)
121122
.setDisplayName("Fresh-Instance-Name")
122123
.addLabel("state", "readytodelete")
123124
.setType(Instance.Type.DEVELOPMENT));
@@ -154,7 +155,7 @@ public void clusterCreationDeletionTest() {
154155
boolean isClusterDeleted = false;
155156
client.createCluster(
156157
CreateClusterRequest.of(instanceId, newClusterId)
157-
.setZone("us-central1-f")
158+
.setZone(testEnvRule.env().getSecondaryZone())
158159
.setStorageType(StorageType.SSD)
159160
.setServeNodes(3));
160161
try {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ public boolean isDirectPathEnabled() {
7878
return "bigtable".equals(System.getenv("GOOGLE_CLOUD_ENABLE_DIRECT_PATH"));
7979
}
8080

81+
public String getPrimaryZone() {
82+
return "us-east1-b";
83+
}
84+
85+
public String getSecondaryZone() {
86+
return "us-central1-b";
87+
}
88+
8189
void cleanUpStale() {
8290
cleanupStaleTables();
8391
if (isInstanceAdminSupported()) {

0 commit comments

Comments
 (0)