chore: update gcloud tests for private IP

Author: kgala2

.ci/cloudbuild.yaml

@@ -13,22 +13,12 @@
 # limitations under the License.
 
 steps:
-  - id: setup gcloud
-    name: gcr.io/google.com/cloudsdktool/cloud-sdk
-    entrypoint: bash
-    args:
-      - '-c'
-      - |
-        which gcloud
-        gcloud version
-
   - id: run integration tests
     name: golang:${_VERSION}
     env:
       - "IP_TYPE=${_IP_TYPE}"
       - "GOOGLE_CLOUD_PROJECT=${PROJECT_ID}"
       - "TMPDIR=/tmp"
-      - "CLOUDSDK_CORE_DISABLE_PROMPTS=1"
     secretEnv:
       - "MYSQL_CONNECTION_NAME"
       - "MYSQL_USER"
@@ -53,8 +43,6 @@ steps:
     args:
     - -c
     - |
-      which gcloud
-
       go test -race -v ./tests/...
 
 substitutions:

tests/mysql_test.go

@@ -208,6 +208,9 @@ func TestMySQLGcloudAuth(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping MySQL integration tests")
 	}
+	if v := os.Getenv("IP_TYPE"); v == "private" || v == "psc" {
+		t.Skipf("skipping test because IP_TYPE is set to %v", v)
+	}
 	requireMySQLVars(t)
 
 	tcs := []struct {

tests/postgres_test.go

@@ -192,6 +192,9 @@ func TestPostgresGcloudAuth(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping Postgres integration tests")
 	}
+	if v := os.Getenv("IP_TYPE"); v == "private" || v == "psc" {
+		t.Skipf("skipping test because IP_TYPE is set to %v", v)
+	}
 	requirePostgresVars(t)
 
 	tcs := []struct {

tests/sqlserver_test.go

@@ -152,6 +152,9 @@ func TestSQLServerGcloudAuth(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping SQL Server integration tests")
 	}
+	if v := os.Getenv("IP_TYPE"); v == "private" || v == "psc" {
+		t.Skipf("skipping test because IP_TYPE is set to %v", v)
+	}
 	requireSQLServerVars(t)
 
 	tcs := []struct {