Merge pull request #15549 from smarterclayton/goversioninfo

Automatic merge from submit-queue

Require goversioninfo for Windows cross builds

Changes in #15218 caused build-cross to now fail during the release process. goversioninfo has to be in the release image.

@jupierce @fabianofranz we should be more cautious about introducing new dependencies to the build in the future. Better testing prior (including running a release build) would probably have caught this. Someone also needs to add build-cross to the additional jobs that can be run and put into the post build step.

images/release/Makefile

@@ -7,6 +7,6 @@ build:
 
 build-images:
 	imagebuilder -t openshift/origin-release:golang-1.7 golang-1.7
-	imagebuilder -t openshift/origin-release:golang-1.8 golang-1.7
-	imagebuilder -t openshift/origin-release:golang-1.9 golang-1.7
+	imagebuilder -t openshift/origin-release:golang-1.8 golang-1.8
+	imagebuilder -t openshift/origin-release:golang-1.9 golang-1.9
 .PHONY: build

images/release/golang-1.7/Dockerfile

@@ -23,7 +23,10 @@ RUN mkdir $TMPDIR && \
     curl -L https://github.com/google/protobuf/releases/download/v3.0.0-beta-4/protoc-3.0.0-beta-4-linux-x86_64.zip | bsdtar -C /usr/local -xf - && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
-    go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports github.com/tools/godep github.com/golang/lint/golint github.com/openshift/imagebuilder/cmd/imagebuilder && \
+    go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports \
+        github.com/tools/godep github.com/golang/lint/golint \
+        github.com/josephspurrier/goversioninfo/cmd/goversioninfo \
+        github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --system user.name origin-release-container && \
     git config --system user.email none@nowhere.com

images/release/golang-1.8/Dockerfile

@@ -23,7 +23,10 @@ RUN mkdir $TMPDIR && \
     curl -L https://github.com/google/protobuf/releases/download/v3.0.0-beta-4/protoc-3.0.0-beta-4-linux-x86_64.zip | bsdtar -C /usr/local -xf - && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
-    go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports github.com/tools/godep github.com/golang/lint/golint github.com/openshift/imagebuilder/cmd/imagebuilder && \
+    go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports \
+        github.com/tools/godep github.com/golang/lint/golint \
+        github.com/josephspurrier/goversioninfo/cmd/goversioninfo \
+        github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --system user.name origin-release-container && \
     git config --system user.email none@nowhere.com

images/release/golang-1.9/Dockerfile

@@ -23,7 +23,10 @@ RUN mkdir $TMPDIR && \
     curl -L https://github.com/google/protobuf/releases/download/v3.0.0-beta-4/protoc-3.0.0-beta-4-linux-x86_64.zip | bsdtar -C /usr/local -xf - && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
-    go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports github.com/tools/godep github.com/golang/lint/golint github.com/openshift/imagebuilder/cmd/imagebuilder && \
+    go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports \
+        github.com/tools/godep github.com/golang/lint/golint \
+        github.com/josephspurrier/goversioninfo/cmd/goversioninfo \
+        github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --system user.name origin-release-container && \
     git config --system user.email none@nowhere.com