Fixed claenup method for Hyperdisk

Author: TetyanaYahodska

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

@@ -57,7 +57,7 @@ public abstract class Util {
   // resources
   // and delete the listed resources based on the timestamp.
 
-  private static final int DELETION_THRESHOLD_TIME_MINUTES = 45;
+  private static final int DELETION_THRESHOLD_TIME_MINUTES = 20;
   // comma separate list of zone names
   private static final String TEST_ZONES_NAME = "JAVA_DOCS_COMPUTE_TEST_ZONES";
   private static final String DEFAULT_ZONES = "us-central1-a,us-west1-a,asia-south1-a";
@@ -238,8 +238,7 @@ public static void cleanUpExistingStoragePool(
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (StoragePoolsClient storagePoolsClient = StoragePoolsClient.create()) {
       for (StoragePool storagePool : storagePoolsClient.list(projectId, zone).iterateAll()) {
-        if (containPrefixToDeleteAndZone(storagePool, prefixToDelete, zone)
-            && isCreatedBeforeThresholdTime(storagePool.getCreationTimestamp())) {
+        if (isCreatedBeforeThresholdTime(storagePool.getCreationTimestamp())) {
           deleteStoragePool(projectId, zone, storagePool.getName());
         }
       }

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

@@ -79,7 +79,7 @@ public static void setUp()
         + UUID.randomUUID().toString().substring(0, 8);
 
     // Cleanup existing stale resources.
-    Util.cleanUpExistingReservations("test-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reservation-" + javaVersion, PROJECT_ID, ZONE);
 
     CreateInstance.createInstance(PROJECT_ID, ZONE, INSTANCE_FOR_RESERVATION);
     CreateReservation.createReservation(