Run “GCP only” tests on kokoro

Signed-off-by: David Gageot <[email protected]>

Makefile

@@ -23,7 +23,7 @@ GSC_BUILD_LATEST ?= gs://$(RELEASE_BUCKET)/builds/latest
 GSC_RELEASE_PATH ?= gs://$(RELEASE_BUCKET)/releases/$(VERSION)
 GSC_RELEASE_LATEST ?= gs://$(RELEASE_BUCKET)/releases/latest
 
-REMOTE_INTEGRATION ?= false
+GCP_ONLY ?= false
 GCP_PROJECT ?= k8s-skaffold
 GKE_CLUSTER_NAME ?= integration-tests
 GKE_ZONE ?= us-central1-a
@@ -90,13 +90,13 @@ install: $(GO_FILES) $(BUILD_DIR)
 
 .PHONY: integration
 integration: install
-ifeq ($(REMOTE_INTEGRATION),true)
+ifeq ($(GCP_ONLY),true)
 	gcloud container clusters get-credentials \
 		$(GKE_CLUSTER_NAME) \
 		--zone $(GKE_ZONE) \
 		--project $(GCP_PROJECT)
 endif
-	REMOTE_INTEGRATION=$(REMOTE_INTEGRATION) go test -v $(REPOPATH)/integration -timeout 15m
+	GCP_ONLY=$(GCP_ONLY) go test -v $(REPOPATH)/integration -timeout 15m
 
 .PHONY: release
 release: cross $(BUILD_DIR)/VERSION
@@ -169,7 +169,6 @@ integration-in-kind: kind-cluster skaffold-builder
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v /tmp/kind-config:/kind-config \
 		-v /tmp/docker-config:/root/.docker/config.json \
-		-e REMOTE_INTEGRATION=$(REMOTE_INTEGRATION) \
 		-e KUBECONFIG=/kind-config \
 		gcr.io/$(GCP_PROJECT)/skaffold-integration
 
@@ -179,7 +178,7 @@ integration-in-docker: skaffold-builder
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v $(HOME)/.config/gcloud:/root/.config/gcloud \
 		-v $(GOOGLE_APPLICATION_CREDENTIALS):$(GOOGLE_APPLICATION_CREDENTIALS) \
-		-e REMOTE_INTEGRATION=$(REMOTE_INTEGRATION) \
+		-e GCP_ONLY=$(GCP_ONLY) \
 		-e GCP_PROJECT=$(GCP_PROJECT) \
 		-e GKE_CLUSTER_NAME=$(GKE_CLUSTER_NAME) \
 		-e GKE_ZONE=$(GKE_ZONE) \

hack/kokoro/presubmit.sh

@@ -18,6 +18,6 @@ export DOCKER_NAMESPACE=gcr.io/k8s-skaffold
 source $KOKORO_GFILE_DIR/common.sh
 
 pushd $KOKORO_ARTIFACTS_DIR/github/skaffold >/dev/null
-    REMOTE_INTEGRATION=true make integration-in-docker
+    GCP_ONLY=true make integration-in-docker
 popd
 

integration/build_test.go

@@ -36,6 +36,9 @@ func TestBuild(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	tests := []struct {
 		description string

integration/config_test.go

@@ -27,6 +27,9 @@ func TestConfigListForContext(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	out := skaffold.Config("list", "-c", "testdata/config/config.yaml", "-k", "test-context").RunOrFailOutput(t)
 
@@ -37,6 +40,9 @@ func TestConfigListForAll(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	out := skaffold.Config("list", "-c", "testdata/config/config.yaml", "--all").RunOrFailOutput(t)
 
@@ -54,6 +60,9 @@ func TestFailToSetUnrecognizedValue(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	err := skaffold.Config("set", "doubt-this-will-ever-be-a-config-key", "VALUE", "-c", "testdata/config/config.yaml", "--global").Run(t)
 
@@ -64,6 +73,9 @@ func TestSetDefaultRepoForContext(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	file, delete := testutil.TempFile(t, "config", nil)
 	defer delete()
@@ -78,6 +90,9 @@ func TestSetGlobalDefaultRepo(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	file, delete := testutil.TempFile(t, "config", nil)
 	defer delete()

integration/debug_test.go

@@ -26,6 +26,9 @@ func TestDebug(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	tests := []struct {
 		description string

integration/deploy_test.go

@@ -28,6 +28,9 @@ func TestBuildDeploy(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	ns, client, deleteNs := SetupNamespace(t)
 	defer deleteNs()
@@ -79,6 +82,9 @@ func TestDeploy(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	ns, client, deleteNs := SetupNamespace(t)
 	defer deleteNs()

integration/dev_test.go

@@ -29,6 +29,9 @@ func TestDev(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	Run(t, "testdata/dev", "sh", "-c", "echo foo > foo")
 	defer Run(t, "testdata/dev", "rm", "foo")

integration/diagnose_test.go

@@ -26,6 +26,9 @@ func TestDiagnose(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	tests := []struct {
 		name string

integration/fix_test.go

@@ -26,6 +26,9 @@ func TestFix(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	ns, _, deleteNs := SetupNamespace(t)
 	defer deleteNs()

integration/helm_test.go

@@ -18,7 +18,6 @@ package integration
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
@@ -33,8 +32,8 @@ func TestHelmDeploy(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	if os.Getenv("REMOTE_INTEGRATION") != "true" {
-		t.Skip("skipping remote only test")
+	if !ShouldRunGCPOnlyTests() {
+		t.Skip("skipping gcp only test")
 	}
 
 	helmDir := "examples/helm-deployment"

integration/init_test.go

@@ -26,6 +26,9 @@ func TestInit(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	tests := []struct {
 		name string

integration/rpc_test.go

@@ -47,6 +47,9 @@ func TestEventLogRPC(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	rpcAddr := randomPort()
 	teardown := setupSkaffoldWithArgs(t, "--rpc-port", rpcAddr)

integration/run_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package integration
 
 import (
-	"os"
 	"testing"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
@@ -36,7 +35,7 @@ func TestRun(t *testing.T) {
 		deployments []string
 		pods        []string
 		env         []string
-		remoteOnly  bool
+		gcpOnly     bool
 	}{
 		{
 			description: "getting-started",
@@ -67,38 +66,38 @@ func TestRun(t *testing.T) {
 			description: "Google Cloud Build",
 			dir:         "examples/google-cloud-build",
 			pods:        []string{"getting-started"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "Google Cloud Build with sub folder",
 			dir:         "testdata/gcb-sub-folder",
 			pods:        []string{"getting-started"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "kaniko",
 			dir:         "examples/kaniko",
 			pods:        []string{"getting-started-kaniko"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "kaniko local",
 			dir:         "examples/kaniko-local",
 			pods:        []string{"getting-started-kaniko"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "kaniko local with sub folder",
 			dir:         "testdata/kaniko-sub-folder",
 			pods:        []string{"getting-started-kaniko"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "kaniko microservices",
 			dir:         "testdata/kaniko-microservices",
 			deployments: []string{"leeroy-app", "leeroy-web"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "jib in googlecloudbuild",
 			dir:         "testdata/jib",
 			args:        []string{"-p", "gcb"},
 			deployments: []string{"web"},
-			remoteOnly:  true,
+			gcpOnly:     true,
 		}, {
 			description: "custom builder",
 			dir:         "testdata/custom",
@@ -107,8 +106,11 @@ func TestRun(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			if test.remoteOnly && os.Getenv("REMOTE_INTEGRATION") != "true" {
-				t.Skip("skipping remote only test")
+			if test.gcpOnly && !ShouldRunGCPOnlyTests() {
+				t.Skip("skipping gcp only test")
+			}
+			if !test.gcpOnly && ShouldRunGCPOnlyTests() {
+				t.Skip("skipping test that is not gcp only")
 			}
 
 			ns, client, deleteNs := SetupNamespace(t)

integration/sync_test.go

@@ -30,6 +30,9 @@ func TestDevSync(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	if ShouldRunGCPOnlyTests() {
+		t.Skip("skipping test that is not gcp only")
+	}
 
 	ns, client, deleteNs := SetupNamespace(t)
 	defer deleteNs()

integration/util.go

@@ -19,6 +19,7 @@ package integration
 import (
 	"context"
 	"fmt"
+	"os"
 	"os/exec"
 	"testing"
 	"time"
@@ -31,6 +32,10 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
+func ShouldRunGCPOnlyTests() bool {
+	return os.Getenv("GCP_ONLY") == "true"
+}
+
 func Run(t *testing.T, dir, command string, args ...string) {
 	cmd := exec.Command(command, args...)
 	cmd.Dir = dir