From af774eb092f4d2291dce0e9062bbda3fdf46b0d6 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Thu, 1 Jul 2021 12:13:36 -0700 Subject: [PATCH 1/4] Fix pr-verified GH actions workflow --- .github/workflows/pr_verified.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_verified.yaml b/.github/workflows/pr_verified.yaml index 190800e523..7b674572ce 100644 --- a/.github/workflows/pr_verified.yaml +++ b/.github/workflows/pr_verified.yaml @@ -40,7 +40,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libvirt-dev - make cross e2e-cross debs + MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs cp -r test/integration/testdata ./out whoami echo github ref $GITHUB_REF From ea6d16db4186d8a5a7641dfbf79f2dd0bc889011 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Thu, 1 Jul 2021 12:14:03 -0700 Subject: [PATCH 2/4] for PR builds: build kvm2-arm64 deb --- hack/jenkins/minikube_cross_build_and_upload.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index ed5394133f..b149c2e187 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -46,6 +46,8 @@ make -j 16 \ out/minikube_${DEB_VER}_amd64.deb \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ + out/docker-machine-driver-kvm2_$(DEB_VER)-0_amd64.deb \ + out/docker-machine-driver-kvm2_$(DEB_VER)-0_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) From 2beaea9fc12cef0b119ef3af2a25c0ce325a4383 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Thu, 1 Jul 2021 12:27:06 -0700 Subject: [PATCH 3/4] fix --- hack/jenkins/minikube_cross_build_and_upload.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index b149c2e187..6bd1c67cef 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -46,8 +46,8 @@ make -j 16 \ out/minikube_${DEB_VER}_amd64.deb \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ - out/docker-machine-driver-kvm2_$(DEB_VER)-0_amd64.deb \ - out/docker-machine-driver-kvm2_$(DEB_VER)-0_arm64.deb \ + out/docker-machine-driver-kvm2_${DEB_VER}-0_amd64.deb \ + out/docker-machine-driver-kvm2_${DEB_VER}-0_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) From 3b5675d9e0478bba16a4be1009fee1583889a940 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Thu, 1 Jul 2021 13:31:44 -0700 Subject: [PATCH 4/4] fix --- hack/jenkins/minikube_cross_build_and_upload.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 6bd1c67cef..94750f6996 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -46,8 +46,8 @@ make -j 16 \ out/minikube_${DEB_VER}_amd64.deb \ out/minikube_${DEB_VER}_arm64.deb \ out/docker-machine-driver-kvm2_$(make deb_version_base).deb \ - out/docker-machine-driver-kvm2_${DEB_VER}-0_amd64.deb \ - out/docker-machine-driver-kvm2_${DEB_VER}-0_arm64.deb \ + out/docker-machine-driver-kvm2_${DEB_VER}_amd64.deb \ + out/docker-machine-driver-kvm2_${DEB_VER}_arm64.deb \ && failed=$? || failed=$? BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version) @@ -72,7 +72,7 @@ fi cp -r test/integration/testdata out/ # Don't upload the buildroot artifacts if they exist -rm -r out/buildroot || true +rm -rf out/buildroot # At this point, the out directory contains the jenkins scripts (populated by jenkins), # testdata, and our build output. Push the changes to GCS so that worker nodes can re-use them.