testing dir change

Author: estroz

commands/operator-sdk/cmd/build.go

@@ -180,7 +180,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
 			cfg := &input.Config{
 				Repo:           projutil.CheckAndGetCurrPkg(),
 				AbsProjectPath: absProjectPath,
-				ProjectName:    filepath.Base(wd),
+				ProjectName:    filepath.Base(absProjectPath),
 			}
 
 			s := &scaffold.Scaffold{}
@@ -201,14 +201,14 @@ func buildFunc(cmd *cobra.Command, args []string) {
 				"-f", testDockerfile,
 				"-t", image,
 				"--build-arg", "TESTDIR="+testLocationBuild,
-			  "--build-arg", "BASEIMAGE="+baseImageName,
+				"--build-arg", "BASEIMAGE="+baseImageName,
 				"--build-arg", "NAMESPACEDMAN="+namespacedManBuild)
 		} else {
 			testBuildCmd = exec.Command("docker", "build", ".",
 				"-f", testDockerfile,
 				"-t", image,
 				"--build-arg", "TESTDIR="+testLocationBuild,
-			  "--build-arg", "BASEIMAGE="+baseImageName,
+				"--build-arg", "BASEIMAGE="+baseImageName,
 				"--build-arg", "NAMESPACEDMAN="+namespacedManBuild)
 		}
 		o, err = testBuildCmd.CombinedOutput()

pkg/scaffold/build_dockerfile.go

@@ -44,6 +44,7 @@ ENV GOARCH amd64
 
 WORKDIR /go/src/{{ .Repo }}
 COPY . /go/src/{{ .Repo }}
+RUN ls -alR /go/src/{{ .Repo }}
 
 RUN go build -o /go/bin/{{ .ProjectName }} {{ .Repo }}/cmd/manager/main.go
 

pkg/scaffold/build_dockerfile_test.go

@@ -41,6 +41,7 @@ ENV GOARCH amd64
 
 WORKDIR /go/src/github.com/example-inc/app-operator
 COPY . /go/src/github.com/example-inc/app-operator
+RUN ls -alR /go/src/github.com/example-inc/app-operator
 
 RUN go build -o /go/bin/app-operator github.com/example-inc/app-operator/cmd/manager/main.go
 

pkg/scaffold/test_framework_dockerfile.go

@@ -42,6 +42,7 @@ ENV GOARCH amd64
 
 WORKDIR /go/src/{{ .Repo }}
 COPY . /go/src/{{ .Repo }}
+RUN ls -alR /go/src/github.com/example-inc/app-operator
 
 ARG TESTDIR
 RUN go test -c -o /go/bin/{{ .ProjectName }}-test ${TESTDIR}/...
@@ -56,4 +57,4 @@ ARG NAMESPACEDMAN
 ADD $NAMESPACEDMAN /namespaced.yaml
 
 ADD build/test-framework/go-test.sh /go-test.sh
-`
+`

pkg/scaffold/test_framework_dockerfile_test.go

@@ -31,10 +31,29 @@ func TestTestFrameworkDockerfile(t *testing.T) {
 	}
 }
 
-const testFrameworkDockerfileExp = `ARG BASEIMAGE
+const testFrameworkDockerfileExp = `# Binary builder image
+FROM golang:1.10.3 AS builder
+
+ENV GOPATH /go
+ENV CGO_ENABLED 0
+ENV GOOS linux
+ENV GOARCH amd64
+
+WORKDIR /go/src/github.com/example-inc/app-operator
+COPY . /go/src/github.com/example-inc/app-operator
+RUN ls -alR /go/src/github.com/example-inc/app-operator
+
+ARG TESTDIR
+RUN go test -c -o /go/bin/app-operator-test ${TESTDIR}/...
+
+# Base image
+ARG BASEIMAGE
 FROM ${BASEIMAGE}
-ADD build/_output/bin/app-operator-test /usr/local/bin/app-operator-test
+
+COPY --from=builder /go/bin/app-operator-test /usr/local/bin/app-operator-test
+
 ARG NAMESPACEDMAN
 ADD $NAMESPACEDMAN /namespaced.yaml
+
 ADD build/test-framework/go-test.sh /go-test.sh
 `