From d01642bab80d3dc4282205728a0f7b5b5380ff24 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 26 Jan 2021 17:11:06 -0800 Subject: [PATCH] use dev/rpm version from makefile --- hack/jenkins/minikube_cross_build_and_upload.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index c714f3678f..4e4065cc2f 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -36,9 +36,8 @@ declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}" declare -rx ISO_VERSION="testing" declare -rx TAG="${ghprbActualCommit}" -declare -rx DEB_VERSION="${ghprbActualCommit}" -declare -rx RPM_VERSION="${ghprbActualCommit}" - +declare -rx DEB_VERSION="$(make deb_version)" +declare -rx RPM_VERSION="$(make deb_version)" docker kill $(docker ps -q) || true docker rm $(docker ps -aq) || true