From: Anil Belur <abelur@linuxfoundation.org>
Date: Sat, 7 Apr 2018 00:30:22 +0000 (+0000)
Subject: Merge "Validate packer version before install"
X-Git-Tag: v0.18.0~12
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=7523625d22342839f99c02c0400a4b5d17252671;hp=81a5e9db553008ac94b279e7a5ed5e186813e40a;p=releng%2Fglobal-jjb.git

Merge "Validate packer version before install"
---

diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh
index 728261c4..54501b8e 100644
--- a/shell/jjb-install.sh
+++ b/shell/jjb-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv "/tmp/v/jjb"
 # shellcheck source=/tmp/v/jjb/bin/activate disable=SC1091
 source "/tmp/v/jjb/bin/activate"
-pip install --quiet --upgrade pip setuptools
+pip install --quiet --upgrade "pip==9.0.3" setuptools
 pip install --quiet --upgrade pipdeptree
 pip install --quiet --upgrade "jenkins-job-builder==$JJB_VERSION"
 
diff --git a/shell/node-install.sh b/shell/node-install.sh
index 43aa7b40..008b3824 100644
--- a/shell/node-install.sh
+++ b/shell/node-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv --quiet "/tmp/v/python"
 # shellcheck source=/tmp/v/node/bin/activate disable=SC1091
 source "/tmp/v/python/bin/activate"
-pip install --quiet --upgrade pip setuptools
+pip install --quiet --upgrade "pip==9.0.3" setuptools
 pip install --quiet --upgrade pipdeptree
 pip install --quiet --upgrade nodeenv
 
diff --git a/shell/pip-install.sh b/shell/pip-install.sh
index c75005d4..9770d665 100644
--- a/shell/pip-install.sh
+++ b/shell/pip-install.sh
@@ -24,7 +24,7 @@ set -e -o pipefail
 virtualenv "/tmp/v/${PIP_PACKAGES%% *}"
 # shellcheck source=/tmp/v/venv/bin/activate disable=SC1091
 source "/tmp/v/${PIP_PACKAGES%% *}/bin/activate"
-pip install --quiet --upgrade pip setuptools
+pip install --quiet --upgrade "pip==9.0.3" setuptools
 pip install --quiet --upgrade pipdeptree
 
 # PIP_PACKAGES needs to be passed through as a space separated list of packages
diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 77ae4286..96c0fa38 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox"
 # shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
 source "/tmp/v/tox/bin/activate"
-pip install --quiet --upgrade pip setuptools
+pip install --quiet --upgrade "pip==9.0.3" setuptools
 pip install --quiet --upgrade pipdeptree
 pip install --quiet --upgrade argparse detox "tox<3.0.0" tox-pyenv