openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "(fix) Changed pip to pip3"

Browse Source
This commit is contained in:
Zuul 2020-06-18 15:47:03 +00:00 committed by Gerrit Code Review
commit eaaf0062e4
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/osh-infra-bandit.yaml
View File

@ -8,7 +8,7 @@
set -xe; set -xe;
./tools/deployment/common/000-install-packages.sh ./tools/deployment/common/000-install-packages.sh
./tools/deployment/common/005-deploy-k8s.sh ./tools/deployment/common/005-deploy-k8s.sh
sudo -H pip install yq bandit sudo -H pip3 install yq bandit
environment: environment:
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
args: args:

18
tools/gate/devel/start.sh
View File

@ -26,9 +26,9 @@ function ansible_install {
if [ "x$ID" == "xubuntu" ]; then if [ "x$ID" == "xubuntu" ]; then
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install -y --no-install-recommends \ sudo apt-get install -y --no-install-recommends \
python-pip \ python3-pip \
libssl-dev \ libssl-dev \
python-dev \ python3-dev \
build-essential \ build-essential \
jq \ jq \
curl curl
@ -36,7 +36,7 @@ function ansible_install {
sudo yum install -y \ sudo yum install -y \
epel-release epel-release
sudo yum install -y \ sudo yum install -y \
python-pip \ python3-pip \
python-devel \ python-devel \
redhat-rpm-config \ redhat-rpm-config \
gcc \ gcc \
@ -52,18 +52,18 @@ function ansible_install {
jq jq
fi fi
sudo -H -E pip install --upgrade pip sudo -H -E pip3 install --upgrade pip
sudo -H -E pip install --upgrade setuptools sudo -H -E pip3 install --upgrade setuptools
# NOTE(lamt) Preinstalling a capped version of cmd2 to address bug: # NOTE(lamt) Preinstalling a capped version of cmd2 to address bug:
# https://github.com/python-cmd2/cmd2/issues/421 # https://github.com/python-cmd2/cmd2/issues/421
sudo -H -E pip install --upgrade "cmd2<=0.8.7" sudo -H -E pip3 install --upgrade "cmd2<=0.8.7"
sudo -H -E pip install --upgrade pyopenssl sudo -H -E pip3 install --upgrade pyopenssl
# NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default. # NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default.
# 2.6 introduces a new command flag (init) for the docker_container module # 2.6 introduces a new command flag (init) for the docker_container module
# that is incompatible with what we have currently. 2.5.5 ensures we match # that is incompatible with what we have currently. 2.5.5 ensures we match
# what's deployed in the gates # what's deployed in the gates
sudo -H -E pip install --upgrade "ansible==2.5.5" sudo -H -E pip3 install --upgrade "ansible==2.5.5"
sudo -H -E pip install --upgrade \ sudo -H -E pip3 install --upgrade \
ara \ ara \
yq yq
} }

8
tools/images/kubeadm-aio/Dockerfile
View File

@ -71,16 +71,16 @@ RUN set -ex ;\
ca-certificates \ ca-certificates \
curl \ curl \
jq \ jq \
python-pip \ python3-pip \
gawk ;\ gawk ;\
pip --no-cache-dir install --upgrade pip==18.1 ;\ pip3 --no-cache-dir install --upgrade pip==18.1 ;\
hash -r ;\ hash -r ;\
pip --no-cache-dir install --upgrade setuptools ;\ pip3 --no-cache-dir install --upgrade setuptools ;\
# NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default. # NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default.
# 2.6 introduces a new command flag (init) for the docker_container module # 2.6 introduces a new command flag (init) for the docker_container module
# that is incompatible with what we have currently. 2.5.5 ensures we match # that is incompatible with what we have currently. 2.5.5 ensures we match
# what's deployed in the gates # what's deployed in the gates
pip --no-cache-dir install --upgrade \ pip3 --no-cache-dir install --upgrade \
requests \ requests \
kubernetes \ kubernetes \
"ansible==2.5.5" ;\ "ansible==2.5.5" ;\