Remove orphan networks in gcloud-java instead of gapic-test (#2278)

Addresses #2118.

Author: tcoffee-google

utilities/integration_test_env.sh

@@ -9,15 +9,14 @@ gcloud components update
 source "$HOME/google-cloud-sdk/path.bash.inc"
 gcloud version
 
-# Remove orphaned firewall rules and networks generated by unintentional aborted runs of
-# google-cloud-node on gapic-test project: see
-# https://github.com/GoogleCloudPlatform/google-cloud-java/issues/2118
-firewalls=$(gcloud compute firewall-rules list | cut -f 1 -d ' ' | grep '^gcloud-tests')
+# 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 '^gcloud-tests')
+networks=$(gcloud compute networks list | cut -f 1 -d ' ' | grep '^test-')
 if [[ $networks ]]
 then
   echo 'Y' | gcloud compute networks delete $networks