Update builder image to include new goveralls version, remove ppc64le

As fedora 30 builds seem to have disappeared from copr we update base to 31. We update libvirt-devel to 5.6.0, remove the virt-preview copr repo, and remove gradle also. Wrt/ fvbommel/util#6 we need to apply a patch to be able to resolve a dependency in order to build pr-creator and the like. Lastly we need to remove the ppc64le arch build as the required builds for that arch are missing in the repos. Signed-off-by: Daniel Hiller <daniel.hiller.1972@gmail.com>
fossedihelm · Aug 25, 2020 · 0a731e8 · 0a731e8
1 parent 89d0b41
commit 0a731e8
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ coverage:
 	hack/dockerized "./hack/coverage.sh ${WHAT}"
 
 goveralls: go-build
-	SYNC_OUT=false hack/dockerized "COVERALLS_TOKEN=${COVERALLS_TOKEN} CI_NAME=prow CI_BUILD_NUMBER=${BUILD_ID} CI_BRANCH=${PULL_BASE_REF} CI_PULL_REQUEST=${PULL_NUMBER} ./hack/goveralls.sh"
+	SYNC_OUT=false hack/dockerized "COVERALLS_TOKEN_FILE=${COVERALLS_TOKEN_FILE} COVERALLS_TOKEN=${COVERALLS_TOKEN} CI_NAME=prow CI_BUILD_NUMBER=${BUILD_ID} CI_BRANCH=${PULL_BASE_REF} CI_PULL_REQUEST=${PULL_NUMBER} ./hack/goveralls.sh"
 
 go-test: go-build
 	SYNC_OUT=false hack/dockerized "./hack/build-go.sh test ${WHAT}"

diff --git a/hack/builder/Dockerfile b/hack/builder/Dockerfile
@@ -1,19 +1,18 @@
 ARG ARCH
-FROM ${ARCH}/fedora:30
+FROM ${ARCH}/fedora:31
 
 COPY qemu-ppc64le-static /usr/bin/qemu-ppc64le-static
 
-ENV LIBVIRT_VERSION 5.1.0
+ENV LIBVIRT_VERSION 5.6.0
 
 ENV BAZEL_VERSION 1.2.1
 
 # Install packages
 RUN dnf install -y dnf-plugins-core && \
-    dnf copr enable -y @virtmaint-sig/virt-preview && \
     dnf copr enable -y vbatts/bazel && \
     dnf -y install \
         libvirt-devel-${LIBVIRT_VERSION} \
-        bazel-${BAZEL_VERSION} \
+        bazel \
         cpio \
         patch \
         make \
@@ -26,7 +25,6 @@ RUN dnf install -y dnf-plugins-core && \
         libstdc++-static \
         glibc-devel \
         findutils \
-        gradle \
         rsync-daemon \
         rsync \
         qemu-img \
@@ -97,19 +95,24 @@ RUN \
     go clean -cache -modcache -r && \
     rm -rf /go && mkdir /go
 
+# TODO: remove this and the patch below after https://github.com/fvbommel/util/issues/6 got fixed
+COPY vbom_ml.diff /tmp/vbom_ml.diff
+
 RUN \
     cd / && \
     export GO111MODULE=on && \
     source /etc/profile.d/gimme.sh && \
     git clone https://github.com/kubernetes/test-infra.git && \
     cd /test-infra && \
     git checkout fd0699b906b0593a33ba2bddd3b1ae8822f42dd8 && \
+    git apply /tmp/vbom_ml.diff && \
+    go mod vendor && \
     cd /test-infra/robots/pr-creator && \
-    go install && \
+    GOPROXY=off GOFLAGS=-mod=vendor go install && \
     cd /test-infra/robots/issue-creator && \
-    go install && \
+    GOPROXY=off GOFLAGS=-mod=vendor go install && \
     cd /test-infra/robots/pr-labeler && \
-    go install && \
+    GOPROXY=off GOFLAGS=-mod=vendor go install && \
     cd /go && \
     go clean -cache -modcache -r && \
     rm -rf /test-infra && \

diff --git a/hack/builder/vbom_ml.diff b/hack/builder/vbom_ml.diff
@@ -0,0 +1,12 @@
+diff --git a/go.mod b/go.mod
+index 17d37ab1a4..7a523d5a3a 100644
+--- a/go.mod
++++ b/go.mod
+@@ -14,6 +14,7 @@ replace (
+ 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
+ 	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
+ 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
++	vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
+ )
+
+ require (
diff --git a/hack/builder/version.sh b/hack/builder/version.sh
@@ -1,2 +1,3 @@
-VERSION=30-5.8.1
-ARCHITECTURES="amd64 ppc64le"
+VERSION=30-5.8.2
+# TODO: reenable ppc64le when new builds are available
+ARCHITECTURES="amd64"
diff --git a/hack/dockerized b/hack/dockerized
@@ -22,7 +22,7 @@ if [ -z ${KUBEVIRT_CRI} ]; then
     fi
 fi
 
-KUBEVIRT_BUILDER_IMAGE="kubevirt/builder@sha256:e6a76ec71f2de87c3bc648bae87ab43a113540bf57da69f07f76bd0edfd500ab"
+KUBEVIRT_BUILDER_IMAGE="kubevirt/builder@sha256:af030d26397e0084e6ab3c3b50b245539d96f2d24fff85e936f2e8bfcaf885d6"
 
 SYNC_OUT=${SYNC_OUT:-true}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ if [ -z ${KUBEVIRT_CRI} ]; then @@
         fi
     fi
-    KUBEVIRT_BUILDER_IMAGE="kubevirt/builder@sha256:e6a76ec71f2de87c3bc648bae87ab43a113540bf57da69f07f76bd0edfd500ab"
+    KUBEVIRT_BUILDER_IMAGE="kubevirt/builder@sha256:af030d26397e0084e6ab3c3b50b245539d96f2d24fff85e936f2e8bfcaf885d6"
     SYNC_OUT=${SYNC_OUT:-true}
@@ Expand Down @@