Integration Tests Spring Cleanup (GoogleContainerTools#3360)

* Integration Tests Spring cleanup Signed-off-by: David Gageot <[email protected]> * Integration Tests Spring cleanup Signed-off-by: David Gageot <[email protected]> * Integration Tests Spring cleanup * Integration Tests Spring cleanup Signed-off-by: David Gageot <[email protected]> * Integration Tests Spring cleanup * Integration Tests Spring cleanup * Integration Tests Spring cleanup * Integration Tests Spring cleanup
ktarplee · Dec 13, 2019 · 015aa1c · 015aa1c
1 parent a995415
commit 015aa1c
Show file tree

Hide file tree

Showing 15 changed files with 379 additions and 503 deletions.
diff --git a/integration/build_cluster_test.go b/integration/build_cluster_test.go
@@ -0,0 +1,153 @@
+/*
+Copyright 2019 The Skaffold Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package integration
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
+	"github.com/GoogleContainerTools/skaffold/testutil"
+)
+
+// run on GCP as this test requires a load balancer
+func TestBuildKanikoInsecureRegistry(t *testing.T) {
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
+	}
+
+	ns, client, deleteNs := SetupNamespace(t)
+	defer deleteNs()
+
+	dir := "testdata/kaniko-insecure-registry"
+	skaffold.Run("-p", "deploy-insecure-registry").InDir(dir).InNs(ns.Name).RunOrFailOutput(t)
+
+	ip := client.ExternalIP("registry")
+	registry := fmt.Sprintf("%s:5000", ip)
+
+	skaffold.Build("--insecure-registry", registry, "-d", registry, "-p", "build-artifact").InDir(dir).InNs(ns.Name).RunOrFailOutput(t)
+}
+
+func TestBuildKanikoWithDefaultRepo(t *testing.T) {
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
+	}
+
+	// The GCS project (k8s-skaffold) has to be deduced from artifact's image name
+	// after the default repo is applied.
+	// If it's not properly resolved, the build will fail.
+	skaffold.Build("-d", "gcr.io/k8s-skaffold").InDir("testdata/kaniko-default-repo").RunOrFail(t)
+}
+
+//see integration/testdata/README.md for details
+func TestBuildInCluster(t *testing.T) {
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
+	}
+
+	testutil.Run(t, "", func(t *testutil.T) {
+		ns, client, deleteNs := SetupNamespace(t.T)
+		defer deleteNs()
+
+		// this workaround is to ensure there is no overlap between testcases on kokoro
+		// see https://github.com/GoogleContainerTools/skaffold/issues/2781#issuecomment-527770537
+		project, err := filepath.Abs("testdata/skaffold-in-cluster")
+		t.CheckNoError(err)
+
+		// copy the skaffold binary to the test case folder
+		// this is geared towards the in-docker setup: the fresh built binary is here
+		// for manual testing, we can override this temporarily
+		skaffoldSrc, err := exec.LookPath("skaffold")
+		t.CheckNoError(err)
+
+		t.NewTempDir().Chdir()
+		copyDir(t, project, ".")
+		copyFile(t, skaffoldSrc, "skaffold")
+
+		// TODO: until https://github.com/GoogleContainerTools/skaffold/issues/2757 is resolved,
+		// this is the simplest way to override the build.cluster.namespace
+		replaceNamespace(t, "skaffold.yaml", ns)
+		replaceNamespace(t, "build-step/kustomization.yaml", ns)
+
+		// we have to copy the e2esecret from default ns -> temporary namespace for kaniko
+		client.CreateSecretFrom("default", "e2esecret")
+
+		skaffold.Run("-p", "create-build-step").InNs(ns.Name).RunOrFail(t.T)
+
+		client.WaitForPodsInPhase(corev1.PodSucceeded, "skaffold-in-cluster")
+	})
+}
+
+func replaceNamespace(t *testutil.T, fileName string, ns *corev1.Namespace) {
+	origSkaffoldYaml, err := ioutil.ReadFile(fileName)
+	if err != nil {
+		t.Fatalf("failed reading %s: %s", fileName, err)
+	}
+
+	namespacedYaml := strings.ReplaceAll(string(origSkaffoldYaml), "VAR_CLUSTER_NAMESPACE", ns.Name)
+
+	if err := ioutil.WriteFile(fileName, []byte(namespacedYaml), 0666); err != nil {
+		t.Fatalf("failed to write %s: %s", fileName, err)
+	}
+}
+
+func copyFile(t *testutil.T, src, dst string) {
+	content, err := ioutil.ReadFile(src)
+	if err != nil {
+		t.Fatalf("can't read source file: %s: %s", src, err)
+	}
+
+	err = ioutil.WriteFile(dst, content, 0666)
+	if err != nil {
+		t.Fatalf("failed to copy file %s to %s: %s", src, dst, err)
+	}
+}
+
+func copyDir(t *testutil.T, src string, dst string) {
+	srcInfo, err := os.Stat(src)
+	if err != nil {
+		t.Fatalf("failed to copy dir %s->%s: %s ", src, dst, err)
+	}
+
+	if err = os.MkdirAll(dst, srcInfo.Mode()); err != nil {
+		t.Fatalf("failed to copy dir %s->%s: %s ", src, dst, err)
+	}
+
+	files, err := ioutil.ReadDir(src)
+	if err != nil {
+		t.Fatalf("failed to copy dir %s->%s: %s ", src, dst, err)
+	}
+
+	for _, f := range files {
+		srcfp := path.Join(src, f.Name())
+		dstfp := path.Join(dst, f.Name())
+
+		if f.IsDir() {
+			copyDir(t, srcfp, dstfp)
+		} else {
+			copyFile(t, srcfp, dstfp)
+		}
+	}
+}
diff --git a/integration/build_gcb_test.go b/integration/build_gcb_test.go
@@ -0,0 +1,34 @@
+/*
+Copyright 2019 The Skaffold Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package integration
+
+import (
+	"testing"
+
+	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
+)
+
+func TestBuildGCBWithDefaultRepo(t *testing.T) {
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
+	}
+
+	// The GCB project (k8s-skaffold) has to be deduced from artifact's image name
+	// after the default repo is applied.
+	// If it's not properly resolved, the build will fail.
+	skaffold.Build("-d", "gcr.io/k8s-skaffold").InDir("testdata/gcb-default-repo").RunOrFail(t)
+}