Skip to content

Commit dab967a

Browse files
Fixed
1 parent a5117a6 commit dab967a

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

compute/cloud-client/src/test/java/compute/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public abstract class Util {
5757
// resources
5858
// and delete the listed resources based on the timestamp.
5959

60-
private static final int DELETION_THRESHOLD_TIME_MINUTES = 20;
60+
private static final int DELETION_THRESHOLD_TIME_MINUTES = 30;
6161
// comma separate list of zone names
6262
private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
6363
private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,14 @@ public static void setUp()
6262
throws IOException, ExecutionException, InterruptedException, TimeoutException {
6363
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
6464
requireEnvVar("GOOGLE_CLOUD_PROJECT");
65+
6566
// Clean up stale resources
6667
Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
6768
Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, ZONE);
69+
Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, "us-central1-a");
70+
Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, "us-central1-a");
71+
Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, "asia-south1-a");
72+
Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, "asia-south1-a");
6873
}
6974

7075
@AfterAll

compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import java.util.concurrent.ExecutionException;
2929
import java.util.concurrent.TimeUnit;
3030
import java.util.concurrent.TimeoutException;
31+
32+
import compute.Util;
3133
import org.junit.Assert;
3234
import org.junit.jupiter.api.AfterAll;
3335
import org.junit.jupiter.api.Assertions;
@@ -57,6 +59,7 @@ public static void setUp()
5759
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
5860
requireEnvVar("GOOGLE_CLOUD_PROJECT");
5961

62+
Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
6063
CreateReservation.createReservation(PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
6164
}
6265

0 commit comments

Comments
 (0)