diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 774d50c86779f118d59db5233a16de1b4b94b385..0f8cec2a2093ee4d3f086f2822543fc1d1979a0a 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -30,8 +30,10 @@ export GOPATH="$HOME/go" export KUBECONFIG="${TEST_HOME}/kubeconfig" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" -# install lsof for finding none driver procs, psmisc to use pstree in cronjobs -sudo apt-get -y install lsof psmisc +if [ "$(uname)" != "Darwin" ]; then + # install lsof for finding none driver procs, psmisc to use pstree in cronjobs + sudo apt-get -y install lsof psmisc +fi # installing golang so we could do go get for gopogh sudo ./installers/check_install_golang.sh "1.15.2" "/usr/local" || true diff --git a/hack/jenkins/installers/check_install_docker.sh b/hack/jenkins/installers/check_install_docker.sh index 83e9875e7794bcc84486aff2c4c8170644dbc6f3..cf2e5e9de91ea287aabe4f3cbc23f735c18d2531 100755 --- a/hack/jenkins/installers/check_install_docker.sh +++ b/hack/jenkins/installers/check_install_docker.sh @@ -18,17 +18,14 @@ set -eux -o pipefail if [[ "$OSTYPE" == "darwin"* ]]; then echo "detected darwin, exiting" - return + exit 0 fi echo "Installing latest docker" -sudo apt-get -y update -sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common -curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian `lsb_release -cs` stable" -sudo apt-get -y update -sudo apt-get -y install docker-ce docker-ce-cli containerd.io -sudo usermod -aG docker jenkins +curl -fsSL https://get.docker.com -o get-docker.sh +sudo sh get-docker.sh +rm get-docker.sh +sudo adduser jenkins docker || true echo "Installing latest kubectl" curl -LO "https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl"