Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify TestBuildInCluster #2829

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Simplify TestBuildInCluster #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 61 additions & 23 deletions integration/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os"
"os/exec"
"path"
"path/filepath"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -124,12 +125,15 @@ func TestBuildInCluster(t *testing.T) {
}

testutil.Run(t, "", func(t *testutil.T) {
//this workaround is to ensure there is no overlap between testcases on kokoro
//see https://github.com/GoogleContainerTools/skaffold/issues/2781#issuecomment-527770537
tmpDir := t.NewTempDir()
testCaseDir := "testdata/skaffold-in-cluster"
workDir := path.Join(tmpDir.Root(), "testdata/skaffold-in-cluster")
t.CopyDir(testCaseDir, workDir)
ns, k8sClient, cleanupNs := SetupNamespace(t.T)
defer cleanupNs()

// 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")
if err != nil {
t.Fatalf("failed getting path to project: %s", err)
}

// copy the skaffold binary to the test case folder
// this is geared towards the in-docker setup: the fresh built binary is here
Expand All @@ -138,49 +142,83 @@ func TestBuildInCluster(t *testing.T) {
if err != nil {
t.Fatalf("failed to find skaffold binary: %s", err)
}
skaffoldDst := path.Join(workDir, "skaffold")
t.CopyFile(skaffoldSrc, skaffoldDst)

ns, k8sClient, cleanupNs := SetupNamespace(t.T)
defer cleanupNs()
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
revert := replaceNamespace(path.Join(workDir, "skaffold.yaml"), t, ns)
defer revert()
revert = replaceNamespace(path.Join(workDir, "build-step/kustomization.yaml"), t, ns)
defer revert()
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
// we have to copy the e2esecret from default ns -> temporary namespace for kaniko
secret, err := k8sClient.client.CoreV1().Secrets("default").Get("e2esecret", metav1.GetOptions{})
if err != nil {
t.Fatalf("failed reading default/e2escret: %s", err)
t.Fatalf("failed reading default/e2esecret: %s", err)
}
secret.Namespace = ns.Name
secret.ResourceVersion = ""
_, err = k8sClient.Secrets().Create(secret)
if err != nil {
t.Fatalf("failed creating %s/e2escret: %s", ns.Name, err)
if _, err = k8sClient.Secrets().Create(secret); err != nil {
t.Fatalf("failed creating %s/e2esecret: %s", ns.Name, err)
}

logs := skaffold.Run("-p", "create-build-step", "--cache-artifacts=true").InDir(workDir).InNs(ns.Name).RunOrFailOutput(t.T)
logs := skaffold.Run("-p", "create-build-step").InNs(ns.Name).RunOrFailOutput(t.T)
t.Logf("create-build-step logs: \n%s", logs)

k8sClient.WaitForPodsInPhase(corev1.PodSucceeded, "skaffold-in-cluster")
})
}

func replaceNamespace(fileName string, t *testutil.T, ns *corev1.Namespace) func() {
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)
}
return func() {
ioutil.WriteFile(fileName, origSkaffoldYaml, 0666)
}

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)
}
}
}

Expand Down
52 changes: 0 additions & 52 deletions testutil/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ package testutil
import (
"errors"
"fmt"
"io/ioutil"
"net/http"
"net/http/httptest"
"os"
"path"
"reflect"
"regexp"
"strings"
Expand Down Expand Up @@ -57,55 +54,6 @@ func (t *T) Override(dest, tmp interface{}) {
t.teardownActions = append(t.teardownActions, teardown)
}

func (t *T) CopyFile(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)
}
t.teardownActions = append(t.teardownActions, func() {
if err := os.Remove(dst); err != nil && !os.IsNotExist(err) {
t.Errorf("failed to remove %s: %s", dst, err)
}
})
}

func (t *T) CopyDir(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() {
t.CopyDir(srcfp, dstfp)
} else {
t.CopyFile(srcfp, dstfp)
}
}
t.teardownActions = append(t.teardownActions, func() {
//by the time this callback is called, all the files should be removed
if err := os.Remove(dst); err != nil && !os.IsNotExist(err) {
t.Errorf("failed to remove dir %s: %s", dst, err)
}
})
}

func (t *T) CheckMatches(pattern, actual string) {
t.T.Helper()
if matches, _ := regexp.MatchString(pattern, actual); !matches {
Expand Down