Adding a few tests for skaffold build

integration/run_test.go

@@ -313,12 +313,22 @@ func TestFix(t *testing.T) {
 	runCmd := exec.Command("skaffold", "run", "--namespace", ns.Name, "-f", "-")
 	runCmd.Dir = "testdata/fix"
 	runCmd.Stdin = bytes.NewReader(out)
-	err = util.RunCmd(runCmd)
-	if err != nil {
+
+	if err := util.RunCmd(runCmd); err != nil {
 		t.Fatalf("testing error: %v", err)
 	}
 }
 
+func TestBuild(t *testing.T) {
+	buildCmd := exec.Command("skaffold", "build")
+	buildCmd.Dir = "testdata/build"
+
+	out, err := util.RunCmdOut(buildCmd)
+	if err != nil {
+		t.Fatalf("testing error: %v, %s", err, out)
+	}
+}
+
 func TestListConfig(t *testing.T) {
 	baseConfig := &config.Config{
 		Global: &config.ContextConfig{

integration/testdata/build/Dockerfile

@@ -0,0 +1,3 @@
+FROM busybox
+
+COPY . /data

integration/testdata/build/multi-env/Dockerfile

@@ -0,0 +1,7 @@
+FROM busybox
+
+ENV file1=file1 \
+    file2=file2
+
+COPY $file1 $file2 /data/
+RUN [ "$(find /data -type f | wc -l | xargs)" == "2" ]

integration/testdata/build/multi-env/file1

@@ -0,0 +1 @@
+file1

integration/testdata/build/multi-env/file2

@@ -0,0 +1 @@
+file2

integration/testdata/build/skaffold.yaml

@@ -0,0 +1,35 @@
+apiVersion: skaffold/v1beta5
+kind: Config
+build:
+  local:
+    push: false
+  artifacts:
+    # A simple Docker build
+  - image: simple-build
+
+    # Building from a sub-directory
+  - image: sub-directory
+    context: sub-directory
+
+    # Testing multiline env variables in Dockerfiles
+    # Would have caught #1624
+  - image: multi-env
+    context: multi-env
+
+    # Testing Dockerfiles with targets
+  - image: targets
+    context: targets
+
+    # Providing a target
+    # Would have caught #1605
+  - image: target1
+    context: targets
+    docker:
+      target: target1
+
+    # Providing another target
+    # Would have caught #1605
+  - image: target2
+    context: targets
+    docker:
+      target: target2

integration/testdata/build/sub-directory/Dockerfile

@@ -0,0 +1,4 @@
+FROM busybox
+
+COPY file1 file2 /data/
+RUN [ "$(find /data -type f | wc -l | xargs)" == "2" ]

integration/testdata/build/sub-directory/file1

@@ -0,0 +1 @@
+file1

integration/testdata/build/sub-directory/file2

@@ -0,0 +1 @@
+file2

integration/testdata/build/targets/Dockerfile

@@ -0,0 +1,9 @@
+FROM busybox as target1
+
+COPY file1 file2 /data/
+RUN [ "$(find /data -type f | wc -l | xargs)" == "2" ]
+
+FROM busybox as target2
+
+COPY file3 /data/
+RUN [ "$(find /data -type f | wc -l | xargs)" == "1" ]

integration/testdata/build/targets/file1

@@ -0,0 +1 @@
+file1

integration/testdata/build/targets/file2

@@ -0,0 +1 @@
+file2

integration/testdata/build/targets/file3

@@ -0,0 +1 @@
+file3