Merge pull request #309 from bowei/e2e1

Add version and gitcommit to the e2e test
kubernetes · Jun 5, 2018 · fda3d63 · fda3d63
2 parents 8faf657 + 959b795
commit fda3d63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/build/build.sh b/build/build.sh
@@ -43,7 +43,10 @@ if [ $GOARCH == "amd64" ]; then
 fi
 
 if echo "${TARGET}" | grep '.*-test$'; then
-  go test -c -o "${TARGET}" "$PKG/cmd/$(basename ${TARGET})"
+  go test -c          \
+    -ldflags "-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitCommit=${GIT_COMMIT}" \
+    -o "${TARGET}"    \
+    "$PKG/cmd/$(basename ${TARGET})"
 else
   go install                                                                                             \
       -installsuffix "static"                                                                            \

diff --git a/cmd/e2e-test/main_test.go b/cmd/e2e-test/main_test.go
@@ -27,6 +27,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/ingress-gce/pkg/e2e"
+	"k8s.io/ingress-gce/pkg/version"
 	// Pull in the auth library for GCP.
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
@@ -60,6 +61,9 @@ func TestMain(m *testing.M) {
 		return
 	}
 
+	fmt.Printf("Version: %q\n", version.Version)
+	fmt.Printf("Commit: %q\n", version.GitCommit)
+
 	var err error
 	var kubeconfig *rest.Config