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

fix scripts

pull/11941/head
Ilya Zuyev 2021-07-08 13:43:10 -07:00
parent 198e8cadb1
commit baa86c389a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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
sudo ARCH="$ARCH"./installers/check_install_golang.sh "1.16.4" "/usr/local" || true ARCH="$ARCH" ./installers/check_install_golang.sh "1.16.4" "/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
@ -444,11 +444,11 @@ if [ -z "${EXTERNAL}" ]; then
echo ">> public URL: ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}.json" echo ">> public URL: ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}.json"
gsutil -qm cp "${JSON_OUT}" "gs://${JOB_GCS_BUCKET}.json" || true gsutil -qm cp "${JSON_OUT}" "gs://${JOB_GCS_BUCKET}.json" || true
echo ">> uploading ${HTML_OUT} to ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}.html" echo ">> uploading ${HTML_OUT} to gs://${JOB_GCS_BUCKET}.html"
echo ">> public URL: ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}.html" echo ">> public URL: ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}.html"
gsutil -qm cp "${HTML_OUT}" "gs://${JOB_GCS_BUCKET}.html" || true gsutil -qm cp "${HTML_OUT}" "gs://${JOB_GCS_BUCKET}.html" || true
echo ">> uploading ${SUMMARY_OUT} to ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}_summary.json" echo ">> uploading ${SUMMARY_OUT} to gs://${JOB_GCS_BUCKET}_summary.json"
echo ">> public URL: ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}_summary.json" echo ">> public URL: ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}_summary.json"
gsutil -qm cp "${SUMMARY_OUT}" "gs://${JOB_GCS_BUCKET}_summary.json" || true gsutil -qm cp "${SUMMARY_OUT}" "gs://${JOB_GCS_BUCKET}_summary.json" || true
else else

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

@ -67,20 +67,28 @@ function check_and_install_golang() {
# install_golang takes two parameters version and path to install. # install_golang takes two parameters version and path to install.
function install_golang() { function install_golang() {
echo "Installing golang version: $1 on $2" local -r GO_VER="$1"
pushd /tmp >/dev/null local -r GO_DIR="$2/go"
echo "Installing golang version: $GO_VER in $GO_DIR"
INSTALLOS=linux INSTALLOS=linux
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
INSTALLOS=darwin INSTALLOS=darwin
fi fi
local -r GO_TGZ="go${GO_VER}.${INSTALLOS}-${ARCH}.tar.gz"
pushd /tmp
# using sudo because previously installed versions might have been installed by a different user. # using sudo because previously installed versions might have been installed by a different user.
# as it was the case on jenkins VM. # as it was the case on jenkins VM.
sudo curl -qL -O "https://storage.googleapis.com/golang/go${1}.${INSTALLOS}-${ARCH}.tar.gz" && sudo rm -rf "$GO_TGZ"
sudo tar -xzf go${1}.${INSTALLOS}-${ARCH}.tar.gz && curl -qL -O "https://storage.googleapis.com/golang/$GO_TGZ" &&
sudo rm -rf "${2}/go" && sudo rm -rf "$GO_DIR" &&
sudo mv go "${2}/" && sudo chown -R $(whoami): ${2}/go sudo mkdir -p "$GO_DIR"
sudo tar -C "$GO_DIR" --strip-components=1 -xzf "$GO_TGZ"
popd >/dev/null popd >/dev/null
echo "installed in $GO_DIR: $($GO_DIR/bin/go version)"
} }
check_and_install_golang check_and_install_golang