minor updates to integration tests and failsafe timeout

pom.xml

@@ -374,6 +374,7 @@
             <hudson.agents.NodeProvisioner.MARGIN0>1.0</hudson.agents.NodeProvisioner.MARGIN0>
             <hudson.remoting.Launcher.pingIntervalSec>-1</hudson.remoting.Launcher.pingIntervalSec>
             <com.google.jenkins.plugins.computeengine.integration.ITUtil.windows>${it.windows}</com.google.jenkins.plugins.computeengine.integration.ITUtil.windows>
+            <jenkins.test.timeout>600</jenkins.test.timeout>
           </systemPropertyVariables>
           <excludes>
             <exclude>**/ITUtil.java</exclude>

src/test/java/com/google/jenkins/plugins/computeengine/integration/ComputeClientIT.java

@@ -36,7 +36,7 @@
 
 /** Integration test suite for {@link ComputeClient}. */
 public class ComputeClientIT {
-    private static Logger log = Logger.getLogger(ComputeClientIT.class.getName());
+    private static final Logger log = Logger.getLogger(ComputeClientIT.class.getName());
 
     private static Map<String, String> label = getLabel(ComputeClientIT.class);
     private static ComputeClient client;

src/test/java/com/google/jenkins/plugins/computeengine/integration/ComputeEngineCloud1WorkerCreatedFor2ExecutorsIT.java

@@ -20,6 +20,7 @@
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.NULL_TEMPLATE;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.PROJECT_ID;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.TEST_TIMEOUT_MULTIPLIER;
+import static com.google.jenkins.plugins.computeengine.integration.ITUtil.ZONE;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.getLabel;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.initClient;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.initCloud;
@@ -30,15 +31,17 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 
+import com.google.api.services.compute.model.Instance;
 import com.google.cloud.graphite.platforms.plugin.client.ComputeClient;
 import com.google.common.collect.ImmutableList;
 import com.google.jenkins.plugins.computeengine.ComputeEngineCloud;
 import hudson.model.labels.LabelAtom;
+import hudson.slaves.NodeProvisioner.PlannedNode;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import org.junit.AfterClass;
@@ -65,13 +68,14 @@ public class ComputeEngineCloud1WorkerCreatedFor2ExecutorsIT {
 
     private static ComputeClient client;
     private static Map<String, String> label = getLabel(ComputeEngineCloud1WorkerCreatedFor2ExecutorsIT.class);
-    private static ComputeEngineCloud cloud;
+    private static Collection<PlannedNode> planned;
+    private static Instance instance;
 
     @BeforeClass
     public static void init() throws Exception {
         log.info("init");
         initCredentials(jenkinsRule);
-        cloud = initCloud(jenkinsRule);
+        ComputeEngineCloud cloud = initCloud(jenkinsRule);
         client = initClient(jenkinsRule, label, log);
 
         cloud.setConfigurations(ImmutableList.of(instanceConfigurationBuilder()
@@ -82,6 +86,11 @@ public static void init() throws Exception {
                 .template(NULL_TEMPLATE)
                 .googleLabels(label)
                 .build()));
+
+        planned = cloud.provision(new LabelAtom(LABEL), 2);
+        planned.iterator().next().future.get();
+
+        instance = client.getInstance(PROJECT_ID, ZONE, planned.iterator().next().displayName);
     }
 
     @AfterClass
@@ -90,13 +99,7 @@ public static void teardown() throws IOException {
     }
 
     @Test
-    public void test1WorkerCreatedFor2ExecutorsStatusRunning()
-            throws ExecutionException, InterruptedException, IOException {
-        var planned = cloud.provision(new LabelAtom(LABEL), 2);
-        assertEquals(1, planned.size());
-
-        planned.iterator().next().future.get();
-
+    public void test1WorkerCreatedFor2ExecutorsStatusRunning() throws IOException {
         // assert on jenkins side
         assertEquals(1, jenkinsRule.jenkins.getNodes().size());
         assertEquals(2, jenkinsRule.jenkins.getNodes().get(0).getNumExecutors());

src/test/java/com/google/jenkins/plugins/computeengine/integration/ComputeEngineCloudNonStandardJavaIT.java

@@ -71,7 +71,7 @@ public class ComputeEngineCloudNonStandardJavaIT {
     public static JenkinsRule jenkinsRule = new JenkinsRule();
 
     private static ComputeClient client;
-    private static Map<String, String> label = getLabel(ComputeEngineCloudNonStandardJavaIT.class);
+    private static final Map<String, String> label = getLabel(ComputeEngineCloudNonStandardJavaIT.class);
 
     @BeforeClass
     public static void init() throws Exception {

src/test/java/com/google/jenkins/plugins/computeengine/integration/ComputeEngineCloudSnapshotCreatedIT.java

@@ -21,6 +21,7 @@
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.PROJECT_ID;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.SNAPSHOT_LABEL;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.SNAPSHOT_TIMEOUT;
+import static com.google.jenkins.plugins.computeengine.integration.ITUtil.TEST_TIMEOUT_MULTIPLIER;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.execute;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.getLabel;
 import static com.google.jenkins.plugins.computeengine.integration.ITUtil.initClient;
@@ -52,16 +53,19 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.recipes.WithTimeout;
 
 /**
  * Integration test suite for {@link ComputeEngineCloud}. Verifies that when configured to use one
  * shot instances and create snapshots, a snapshot will be created upon instance termination when a
  * build fails.
  */
 public class ComputeEngineCloudSnapshotCreatedIT {
-    private static Logger log = Logger.getLogger(ComputeEngineCloudSnapshotCreatedIT.class.getName());
+    private static final Logger log = Logger.getLogger(ComputeEngineCloudSnapshotCreatedIT.class.getName());
+
+    @ClassRule
+    public static Timeout timeout = new Timeout(15L * TEST_TIMEOUT_MULTIPLIER, TimeUnit.MINUTES);
 
     @ClassRule
     public static JenkinsRule jenkinsRule = new JenkinsRule();
@@ -117,19 +121,16 @@ public static void teardown() throws IOException {
     }
 
     /** Tests snapshot is created when we have failure builds for given node */
-    @WithTimeout(1200)
     @Test
     public void testSnapshotCreatedNotNull() {
         assertNotNull(createdSnapshot);
     }
 
-    @WithTimeout(1200)
     @Test
     public void testSnapshotCreatedStatusReady() {
         assertEquals("READY", createdSnapshot.getStatus());
     }
 
-    @WithTimeout(1200)
     @Test
     public void testSnapshotCreatedOneShotInstanceDeleted() {
         Awaitility.await()

src/test/java/com/google/jenkins/plugins/computeengine/integration/ComputeEngineCloudWorkerCreatedIT.java

@@ -64,7 +64,7 @@
  * are provisioned properly.
  */
 public class ComputeEngineCloudWorkerCreatedIT {
-    private static Logger log = Logger.getLogger(ComputeEngineCloudWorkerCreatedIT.class.getName());
+    private static final Logger log = Logger.getLogger(ComputeEngineCloudWorkerCreatedIT.class.getName());
 
     @ClassRule
     public static Timeout timeout = new Timeout(10L * TEST_TIMEOUT_MULTIPLIER, TimeUnit.MINUTES);

src/test/java/com/google/jenkins/plugins/computeengine/integration/ComputeEngineCloudWorkerFailedIT.java

@@ -52,7 +52,7 @@
  * worker fails upon creation when Java is not installed.
  */
 public class ComputeEngineCloudWorkerFailedIT {
-    private static Logger log = Logger.getLogger(ComputeEngineCloudWorkerFailedIT.class.getName());
+    private static final Logger log = Logger.getLogger(ComputeEngineCloudWorkerFailedIT.class.getName());
 
     @ClassRule
     public static Timeout timeout = new Timeout(7L * TEST_TIMEOUT_MULTIPLIER, TimeUnit.MINUTES);

src/test/java/com/google/jenkins/plugins/computeengine/integration/ConfigAsCodeNonStandardJavaIT.java

@@ -38,7 +38,7 @@
  * java path.
  */
 public class ConfigAsCodeNonStandardJavaIT {
-    private static Logger log = Logger.getLogger(ConfigAsCodeNonStandardJavaIT.class.getName());
+    private static final Logger log = Logger.getLogger(ConfigAsCodeNonStandardJavaIT.class.getName());
 
     @ClassRule
     public static JenkinsRule jenkinsRule = new JenkinsRule();

src/test/java/com/google/jenkins/plugins/computeengine/integration/ConfigAsCodeTestIT.java

@@ -31,7 +31,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 
 public class ConfigAsCodeTestIT {
-    private static Logger log = Logger.getLogger(ConfigAsCodeTestIT.class.getName());
+    private static final Logger log = Logger.getLogger(ConfigAsCodeTestIT.class.getName());
 
     @ClassRule
     public static JenkinsRule jenkinsRule = new JenkinsRule();