chore: Fix flaky IT test cases (#8260)

* chore: Busy wait java-container CREATE operation to finish * chore: Delete any existing java-notebook instances * chore: Use ListInstanceRequest with parent * chore: Delete gapic compute instances * chore: Use ZonedDateTime for RFC3339 with Zone * chore: Setup the correct Request object field * chore: Create new IT profile * chore: Move shared deps profile to root pom.xml * chore: Use test lifecycle phase for graalvm tests * chore: Use old pom configs * chore: Use correct path to vision resources * chore: Remove unused pom.xml * chore: Move busy wait after CREATE operation * chore: Add specific names for IT compute instances * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Clean up compute instances names * chore: Clean up instances * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Add checks for deletion * chore: Add missing import * chore: Add missing import for notebooks Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Sep 12, 2022 · 8e4378d · 8e4378d
1 parent db7c7d1
commit 8e4378d
Show file tree

Hide file tree

Showing 11 changed files with 144 additions and 57 deletions.
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -156,7 +156,7 @@ case ${JOB_TYPE} in
           -Penable-integration-tests \
           -Pnative \
           -fae \
-          verify
+          test
       RETURN_CODE=$?
       printf "Finished Unit and Integration Tests for GraalVM Native:\n%s\n" "${module_list}"
     else
@@ -182,7 +182,7 @@ case ${JOB_TYPE} in
           -Penable-integration-tests \
           -Pnative \
           -fae \
-          verify
+          test
       RETURN_CODE=$?
       printf "Finished Unit and Integration Tests for GraalVM Native 17:\n%s\n" "${module_list}"
     else

diff --git a/.../google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/BaseTest.java b/.../google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/BaseTest.java
@@ -22,8 +22,9 @@ public class BaseTest {
   protected static final String DEFAULT_PROJECT = ServiceOptions.getDefaultProjectId();
   protected static final String DEFAULT_ZONE = "us-central1-a";
   protected static final String DEFAULT_REGION = "us-west1";
+  protected static final String COMPUTE_PREFIX = "it-test-compute";
 
   public static String generateRandomName(String placeholder) {
-    return "gapic-" + placeholder + UUID.randomUUID().toString().substring(0, 8);
+    return COMPUTE_PREFIX + "-" + placeholder + "-" + UUID.randomUUID().toString().substring(0, 8);
   }
 }
diff --git a/...d-compute/src/test/java/com/google/cloud/compute/v1/integration/ITSmokeInstancesTest.java b/...d-compute/src/test/java/com/google/cloud/compute/v1/integration/ITSmokeInstancesTest.java
@@ -72,6 +72,8 @@ public static void setUp() throws IOException {
     instances = new ArrayList<>();
     InstancesSettings instanceSettings = InstancesSettings.newBuilder().build();
     instancesClient = InstancesClient.create(instanceSettings);
+
+    Util.cleanUpComputeInstances(instancesClient, DEFAULT_PROJECT, DEFAULT_ZONE);
   }
 
   @Before

diff --git a/...pute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/Util.java b/...pute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/Util.java
@@ -0,0 +1,37 @@
+package com.google.cloud.compute.v1.integration;
+
+import com.google.cloud.compute.v1.DeleteInstanceRequest;
+import com.google.cloud.compute.v1.Instance;
+import com.google.cloud.compute.v1.InstancesClient;
+import com.google.cloud.compute.v1.InstancesClient.ListPagedResponse;
+import java.time.Instant;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+public class Util {
+
+  // Cleans existing test resources if any.
+  private static final int DELETION_THRESHOLD_TIME_HOURS = 24;
+
+  /** Bring down any instances that are older than 24 hours */
+  public static void cleanUpComputeInstances(
+      InstancesClient instancesClient, String project, String zone) {
+    ListPagedResponse listPagedResponse = instancesClient.list(project, zone);
+    for (Instance instance : listPagedResponse.iterateAll()) {
+      if (isCreatedBeforeThresholdTime(
+              ZonedDateTime.parse(instance.getCreationTimestamp()).toInstant())
+          && instance.getName().startsWith(BaseTest.COMPUTE_PREFIX)) {
+        instancesClient.deleteAsync(
+            DeleteInstanceRequest.newBuilder()
+                .setInstance(instance.getName())
+                .setProject(project)
+                .setZone(zone)
+                .build());
+      }
+    }
+  }
+
+  private static boolean isCreatedBeforeThresholdTime(Instant instant) {
+    return instant.isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_HOURS, ChronoUnit.HOURS));
+  }
+}
diff --git a/java-container/README.md b/java-container/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.1.0</version>
+      <version>26.1.1</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.0')
+implementation platform('com.google.cloud:libraries-bom:26.1.1')
 
 implementation 'com.google.cloud:google-cloud-container'
 ```

diff --git a/...r/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java b/...r/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java
@@ -26,6 +26,7 @@
 import com.google.container.v1.ListOperationsResponse;
 import com.google.container.v1.NodePool;
 import com.google.container.v1.Operation;
+import com.google.container.v1.Operation.Status;
 import com.google.container.v1.ServerConfig;
 import java.util.List;
 import java.util.UUID;
@@ -37,16 +38,18 @@
 
 public class ITSystemTest {
 
+  protected static final String CONTAINER_PREFIX = "it-test-container";
+
   private static ClusterManagerClient client;
   private static Operation operation;
 
   private static final Logger LOG = Logger.getLogger(ITSystemTest.class.getName());
   private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
   private static final String ZONE = "us-central1-a";
   private static final String CLUSTER_NAME =
-      "test-cluster-" + UUID.randomUUID().toString().substring(0, 8);
+      CONTAINER_PREFIX + "-cluster-" + UUID.randomUUID().toString().substring(0, 8);
   private static final String NODE_POOL_NAME =
-      "test-node-pool-" + UUID.randomUUID().toString().substring(0, 8);
+      CONTAINER_PREFIX + "-node-pool-" + UUID.randomUUID().toString().substring(0, 8);
   private static final String DETAIL = "test-detail";
   private static final String STATUS_MESSAGE = "test-status-message";
   private static final String SELF_LINK =
@@ -63,7 +66,7 @@ public static void beforeClass() throws Exception {
     client = ClusterManagerClient.create();
     Util.cleanUpExistingInstanceCluster(PROJECT_ID, ZONE, client);
 
-    /** create node pool* */
+    /* create node pool* */
     NodePool nodePool =
         NodePool.newBuilder()
             .setInitialNodeCount(INITIAL_NODE_COUNT)
@@ -72,7 +75,7 @@ public static void beforeClass() throws Exception {
             .setStatusMessage(STATUS_MESSAGE)
             .build();
 
-    /** create cluster */
+    /* create cluster */
     Cluster cluster =
         Cluster.newBuilder()
             .setName(CLUSTER_NAME)
@@ -84,13 +87,20 @@ public static void beforeClass() throws Exception {
             .setNetwork(NETWORK)
             .build();
     operation = client.createCluster(PROJECT_ID, ZONE, cluster);
+
+    Operation response = client.getOperation(PROJECT_ID, ZONE, operation.getName());
+    // Busy Wait for one minute at a time until Cluster CREATE operation is complete
+    while (response.getStatus() != Status.DONE) {
+      LOG.info(String.format("Cluster CREATE Operation Status: %s", response.getStatus()));
+      Thread.sleep(TimeUnit.MINUTES.toMillis(1));
+      response = client.getOperation(PROJECT_ID, ZONE, operation.getName());
+    }
     LOG.info(String.format("%s cluster created successfully.", CLUSTER_NAME));
     LOG.info(String.format("%s node pool created successfully.", NODE_POOL_NAME));
   }
 
   @AfterClass
-  public static void afterClass() throws Exception {
-    Thread.sleep(TimeUnit.MINUTES.toMillis(5));
+  public static void afterClass() {
     client.deleteCluster(PROJECT_ID, ZONE, CLUSTER_NAME);
     LOG.info(String.format("%s cluster deleted successfully.", CLUSTER_NAME));
     client.close();

diff --git a/...container/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java b/...container/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java
@@ -19,27 +19,26 @@
 import com.google.cloud.container.v1.ClusterManagerClient;
 import com.google.container.v1.Cluster;
 import com.google.container.v1.ListClustersResponse;
-import java.io.IOException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 
 public class Util {
+
   // Cleans existing test resources if any.
   private static final int DELETION_THRESHOLD_TIME_HOURS = 24;
 
   /** tear down any clusters that are older than 24 hours * */
   public static void cleanUpExistingInstanceCluster(
-      String projectId, String zone, ClusterManagerClient client)
-      throws IOException, ExecutionException, InterruptedException {
+      String projectId, String zone, ClusterManagerClient client) {
 
     ListClustersResponse clustersResponse = client.listClusters(projectId, zone);
     List<Cluster> clusters = clustersResponse.getClustersList();
 
     for (Cluster cluster : clusters) {
-      if (isCreatedBeforeThresholdTime(cluster.getCreateTime())) {
+      if (isCreatedBeforeThresholdTime(cluster.getCreateTime())
+          && cluster.getName().startsWith(ITSystemTest.CONTAINER_PREFIX)) {
         client.deleteCluster(projectId, zone, cluster.getName());
       }
     }

diff --git a/...ooks/src/test/java/com/google/cloud/notebooks/v1beta1/it/ITNotebookServiceClientTest.java b/...ooks/src/test/java/com/google/cloud/notebooks/v1beta1/it/ITNotebookServiceClientTest.java
@@ -48,13 +48,15 @@
 
 public class ITNotebookServiceClientTest {
 
+  protected static final String NOTEBOOK_PREFIX = "it-test-notebook";
+
   private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
   private static final String LOCATION = "us-central1-a";
   private static final String PARENT = "projects/" + PROJECT_ID + "/locations/" + LOCATION;
   private static NotebookServiceClient client;
   private static final String ID = UUID.randomUUID().toString().substring(0, 8);
-  private static final String NOTEBOOK_INSTANCE_ID = "test-notebook-instance-id-" + ID;
-  private static final String ENVIRONMENT_ID = "test-environment-id-" + ID;
+  private static final String NOTEBOOK_INSTANCE_ID = NOTEBOOK_PREFIX + "-instance-id-" + ID;
+  private static final String ENVIRONMENT_ID = NOTEBOOK_PREFIX + "-environment-id-" + ID;
   private static final String INSTANCE_NAME = PARENT + "/instances/" + NOTEBOOK_INSTANCE_ID;
   private static final String ENVIRONMENT_NAME = PARENT + "/environments/" + ENVIRONMENT_ID;
   private static Instance expectedNotebookInstance;
@@ -66,6 +68,8 @@ public class ITNotebookServiceClientTest {
   public static void setUp() throws IOException, ExecutionException, InterruptedException {
     // Create Test Notebook Instance
     client = NotebookServiceClient.create();
+    Util.cleanUpNotebookInstances(client, PARENT);
+
     ContainerImage containerImage =
         ContainerImage.newBuilder().setRepository(FieldBehavior.OPTIONAL.name()).build();
 

diff --git a/...ooks/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/it/Util.java b/...ooks/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/it/Util.java
@@ -0,0 +1,34 @@
+package com.google.cloud.notebooks.v1beta1.it;
+
+import com.google.cloud.notebooks.v1beta1.DeleteInstanceRequest;
+import com.google.cloud.notebooks.v1beta1.Instance;
+import com.google.cloud.notebooks.v1beta1.ListInstancesRequest;
+import com.google.cloud.notebooks.v1beta1.NotebookServiceClient;
+import com.google.cloud.notebooks.v1beta1.NotebookServiceClient.ListInstancesPagedResponse;
+import com.google.protobuf.util.Timestamps;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+
+public class Util {
+
+  // Cleans existing test resources if any.
+  private static final int DELETION_THRESHOLD_TIME_HOURS = 24;
+
+  /** Bring down any instances that are older than 24 hours */
+  public static void cleanUpNotebookInstances(NotebookServiceClient client, String parent) {
+    ListInstancesPagedResponse listInstancesPagedResponse =
+        client.listInstances(ListInstancesRequest.newBuilder().setParent(parent).build());
+    for (Instance instance : listInstancesPagedResponse.iterateAll()) {
+      if (isCreatedBeforeThresholdTime(
+              Instant.ofEpochMilli(Timestamps.toMillis(instance.getCreateTime())))
+          && instance.getName().startsWith(ITNotebookServiceClientTest.NOTEBOOK_PREFIX)) {
+        client.deleteInstanceAsync(
+            DeleteInstanceRequest.newBuilder().setName(instance.getName()).build());
+      }
+    }
+  }
+
+  private static boolean isCreatedBeforeThresholdTime(Instant instant) {
+    return instant.isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_HOURS, ChronoUnit.HOURS));
+  }
+}
diff --git a/java-vision/google-cloud-vision/src/test/java/com/google/cloud/vision/it/ITSystemTest.java b/java-vision/google-cloud-vision/src/test/java/com/google/cloud/vision/it/ITSystemTest.java
@@ -99,8 +99,8 @@ public class ITSystemTest {
   private static final String ID = UUID.randomUUID().toString().substring(0, 8);
   // GraalVM native-image test uses the project root as working directory, not google-cloud-vision
   private static final String RESOURCES =
-      Files.exists(Paths.get("google-cloud-vision", "src", "test", "resources"))
-          ? "google-cloud-vision/src/test/resources/"
+      Files.exists(Paths.get("java-vision","google-cloud-vision", "src", "test", "resources"))
+          ? "java-vision/google-cloud-vision/src/test/resources/"
           : "src/test/resources/";
 
   private static final String GCS_BUCKET_ENV_VAR = "GOOGLE_CLOUD_TESTS_VISION_BUCKET";

diff --git a/pom.xml b/pom.xml
@@ -155,42 +155,42 @@
   </modules>
 
   <build>
-  <plugins>
-    <!-- jacoco code coverage -->
-    <plugin>
-      <groupId>org.jacoco</groupId>
-      <artifactId>jacoco-maven-plugin</artifactId>
-      <version>0.8.7</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>prepare-agent</goal>
-          </goals>
-        </execution>
-        <execution>
-          <id>report</id>
-          <phase>test</phase>
-          <goals>
-            <goal>report</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-plugin</artifactId>
-      <configuration>
-        <skip>${skipUnitTests}</skip>
-      </configuration>
-    </plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-failsafe-plugin</artifactId>
-      <configuration>
-        <forkCount>1C</forkCount>
-        <reuseForks>true</reuseForks>
-      </configuration>
-    </plugin>
-  </plugins>
+    <plugins>
+      <!-- jacoco code coverage -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.7</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>${skipUnitTests}</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <forkCount>1C</forkCount>
+          <reuseForks>true</reuseForks>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>