kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make sure to install the same version of golang across scripts

pull/12393/head
Sharif Elgamal 2021-09-02 11:22:53 -07:00
parent 314237b05a
commit f11d14de59
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/jenkins/build/minikube_build_upload_latest.sh
View File

@ -22,8 +22,7 @@ set -eux -o pipefail
readonly bucket="minikube/latest" readonly bucket="minikube/latest"
# Make sure the right golang version is installed based on Makefile # Make sure the right golang version is installed based on Makefile
WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }') ./hack/jenkins/installers/check_install_golang.sh /usr/local
./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
declare -rx GOPATH=/var/lib/jenkins/go declare -rx GOPATH=/var/lib/jenkins/go

2
hack/jenkins/common.sh
View File

@ -91,7 +91,7 @@ else
fi fi
# installing golang so we could do go get for gopogh # installing golang so we could do go get for gopogh
./installers/check_install_golang.sh "1.17" "/usr/local" || true ./installers/check_install_golang.sh "/usr/local" || true
# install docker and kubectl if not present # install docker and kubectl if not present
sudo ARCH="$ARCH" ./installers/check_install_docker.sh || true sudo ARCH="$ARCH" ./installers/check_install_docker.sh || true

10
hack/jenkins/installers/check_install_golang.sh
View File

@ -16,14 +16,14 @@
set -eux -o pipefail set -eux -o pipefail
if (($# < 2)); then if (($# < 1)); then
echo "ERROR: given ! ($#) number of parameters but expect 2." echo "ERROR: given ! ($#) parameters but expected 1."
echo "USAGE: ./check_install_golang.sh VERSION_TO_INSTALL INSTALL_PATH" echo "USAGE: ./check_install_golang.sh INSTALL_PATH"
exit 1 exit 1
fi fi
VERSION_TO_INSTALL=${1} VERSION_TO_INSTALL=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }')
INSTALL_PATH=${2} INSTALL_PATH=${1}
function current_arch() { function current_arch() {
case $(arch) in case $(arch) in

3
hack/jenkins/kicbase_auto_build.sh
View File

@ -24,6 +24,9 @@ docker login -u ${DOCKERHUB_USER} -p ${DOCKERHUB_PASS}
# Make sure gh is installed and configured # Make sure gh is installed and configured
./hack/jenkins/installers/check_install_gh.sh ./hack/jenkins/installers/check_install_gh.sh
# Make sure golang is installed and configured
./installers/check_install_golang.sh "/usr/local" || true
# Let's make sure we have the newest kicbase reference # Let's make sure we have the newest kicbase reference
curl -L https://github.com/kubernetes/minikube/raw/master/pkg/drivers/kic/types.go --output types-head.go curl -L https://github.com/kubernetes/minikube/raw/master/pkg/drivers/kic/types.go --output types-head.go
# kicbase tags are of the form VERSION-TIMESTAMP-PR, so this grep finds that TIMESTAMP in the middle # kicbase tags are of the form VERSION-TIMESTAMP-PR, so this grep finds that TIMESTAMP in the middle

3
hack/jenkins/minikube_cross_build_and_upload.sh
View File

@ -26,8 +26,7 @@ set -eux -o pipefail
readonly bucket="minikube-builds" readonly bucket="minikube-builds"
# Make sure the right golang version is installed based on Makefile # Make sure the right golang version is installed based on Makefile
WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }') ./hack/jenkins/installers/check_install_golang.sh /usr/local
./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
declare -rx BUILD_IN_DOCKER=y declare -rx BUILD_IN_DOCKER=y

2
hack/jenkins/prbot.sh
View File

@ -27,7 +27,7 @@ fi
./installers/check_install_gh.sh ./installers/check_install_gh.sh
# Make sure go is installed and configured # Make sure go is installed and configured
./installers/check_install_golang.sh "1.16" "/usr/local" || true ./installers/check_install_golang.sh "/usr/local" || true
# Grab latest code # Grab latest code
git clone https://github.com/kubernetes/minikube.git git clone https://github.com/kubernetes/minikube.git

3
hack/jenkins/preload_generation.sh
View File

@ -21,8 +21,7 @@
set -eux -o pipefail set -eux -o pipefail
# Make sure the right golang version is installed based on Makefile # Make sure the right golang version is installed based on Makefile
WANT_GOLANG_VERSION=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }') ./hack/jenkins/installers/check_install_golang.sh /usr/local
./hack/jenkins/installers/check_install_golang.sh $WANT_GOLANG_VERSION /usr/local
make upload-preloaded-images-tar make upload-preloaded-images-tar
make clean make clean