Disable network tests to avoid orphan networks

tcoffee-google · tcoffee-google · commit afde087785a6 · 2017-07-27T13:14:38.000-07:00
Addresses #2118.
diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,6 @@ before_install:
 - cp target/travis/logging.properties logging.properties
 install: mvn install --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true
   -Dgpg.skip=true
-cache:
-  directories:
-    - "$HOME/google-cloud-sdk/"
 script:
 - travis_wait 60 utilities/verify.sh
 after_success:
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/it/ITComputeTest.java b/google-cloud-compute/src/test/java/com/google/cloud/compute/it/ITComputeTest.java
@@ -85,6 +85,7 @@
 import java.util.concurrent.TimeoutException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -1343,6 +1344,7 @@ public void testListImagesWithFilter() {
     assertTrue(count > 0);
   }
 
+  @Ignore("Avoid leaving orphan networks when interrupted: see #2118")
   @Test
   public void testCreateAndGetNetwork() throws InterruptedException, TimeoutException {
     String name = BASE_RESOURCE_NAME + "create-and-get-network";
@@ -1376,6 +1378,7 @@ public void testCreateAndGetNetwork() throws InterruptedException, TimeoutExcept
     assertNull(compute.getNetwork(name));
   }
 
+  @Ignore("Avoid leaving orphan networks when interrupted: see #2118")
   @Test
   public void testListNetworks() throws InterruptedException, TimeoutException {
     String name = BASE_RESOURCE_NAME + "list-network";
@@ -1424,6 +1427,7 @@ public void testListNetworks() throws InterruptedException, TimeoutException {
     assertNull(compute.getNetwork(name));
   }
 
+  @Ignore("Avoid leaving orphan networks when interrupted: see #2118")
   @Test
   public void testCreateNetworkAndSubnetwork() throws InterruptedException, TimeoutException {
     String networkName = BASE_RESOURCE_NAME + "create-subnetwork-network";
@@ -1511,6 +1515,7 @@ public void testCreateNetworkAndSubnetwork() throws InterruptedException, Timeou
     assertNull(compute.getNetwork(networkName));
   }
 
+  @Ignore("Avoid leaving orphan networks when interrupted: see #2118")
   @Test
   public void testAggregatedListSubnetworks() throws InterruptedException, TimeoutException {
     String networkName = BASE_RESOURCE_NAME + "list-subnetwork-network";
diff --git a/utilities/integration_test_env.sh b/utilities/integration_test_env.sh
@@ -1,27 +1,3 @@
-# Ensure latest Google Cloud SDK installed, for commands below
-if [ ! -d "$HOME/google-cloud-sdk/bin" ]
-then
-  rm -rf "$HOME/google-cloud-sdk"
-  export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-  curl https://sdk.cloud.google.com | bash
-fi
-gcloud components update
-source "$HOME/google-cloud-sdk/path.bash.inc"
-gcloud version
-
-# Remove orphaned firewall rules and networks presumed generated by interrupted runs of Compute
-# integration tests: see https://github.com/GoogleCloudPlatform/google-cloud-java/issues/2118
-firewalls=$(gcloud compute firewall-rules list | cut -f 1 -d ' ' | grep '^test-')
-if [[ $firewalls ]]
-then
-  echo 'Y' | gcloud compute firewall-rules delete $firewalls
-fi
-networks=$(gcloud compute networks list | cut -f 1 -d ' ' | grep '^test-')
-if [[ $networks ]]
-then
-  echo 'Y' | gcloud compute networks delete $networks
-fi
-
 # Export test env variables
 export GCLOUD_PROJECT="gcloud-devel"
 export GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json
