openstack
/
tripleo-ci
Code Issues Proposed changes

Uninstall certifi/requests/urllib3 pip installation 

requests-2.16.5 has added urllib3 package as dependency. Requests is
being installed using pip as dependency for git-review in DIB.

This parch removes urllib in node preparation for puppet jobs as it
will be installed as requirement for requests rpm package.

This patch should be a workaround until git-review is removed from
nodepool images.
See comments on https://review.openstack.org/#/c/468823.

Change-Id: Ia839cac125e2a749fc9ce40894e5900237ec3ae1
This commit is contained in:
Emilien Macchi 2017-05-29 15:01:52 +02:00 committed by Alfredo Moralejo
parent fbee761f0f
commit 5ee54ae448
5 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/bootstrap-overcloud-full-minimal.sh
View File

@ -16,9 +16,13 @@ sudo yum erase -y epel-release || :
# Copied from toci_gate_test.sh...need to apply this fix on subnodes as well
# TODO(pabelanger): Why is python-requests installed from pip?
sudo rm -rf /usr/lib/python2.7/site-packages/requests /usr/lib/python2.7/site-packages/urllib3
sudo rpm -e --nodeps python-requests python-urllib3 || :
sudo rpm -e --nodeps python2-requests python2-urllib3 || :
# TODO(amoralej): remove after https://review.openstack.org/#/c/468872/ is merged
sudo pip uninstall certifi -y || true
sudo pip uninstall urllib3 -y || true
sudo pip uninstall requests -y || true
sudo rpm -e --nodeps python2-certifi || :
sudo rpm -e --nodeps python2-urllib3 || :
sudo rpm -e --nodeps python2-requests || :
sudo yum -y install python-requests python-urllib3
# Clear out any puppet modules on the node placed their by infra configuration

11
scripts/bootstrap-overcloud-full.sh
View File

@ -18,11 +18,16 @@ sudo yum erase -y epel-release || :
# TODO(pabelanger): Why is python-requests installed from pip?
# Reinstall python-requests if it was already installed, otherwise it will be
# installed later when other packages are installed.
sudo rm -rf /usr/lib/python2.7/site-packages/requests /usr/lib/python2.7/site-packages/urllib3
sudo rpm -e --nodeps python-requests python-urllib3 || :
sudo rpm -e --nodeps python2-requests python2-urllib3 || :
# TODO(amoralej): remove after https://review.openstack.org/#/c/468872/ is merged
sudo pip uninstall certifi -y || true
sudo pip uninstall urllib3 -y || true
sudo pip uninstall requests -y || true
sudo rpm -e --nodeps python2-certifi || :
sudo rpm -e --nodeps python2-urllib3 || :
sudo rpm -e --nodeps python2-requests || :
sudo yum -y install python-requests python-urllib3
# Remove the anything on the infra image template that might interfere with CI
# Note for tripleo-quickstart: this task is already managed in tripleo-ci-setup-playbook.yml
sudo yum remove -y facter puppet hiera puppetlabs-release rdo-release centos-release-openstack-* centos-release-ceph-*

10
toci_gate_test-oooq.sh
View File

@ -55,9 +55,13 @@ rpm -q qemu-img || \
# NOTE(pabelanger): Current hack to make centos-7 dib work.
# TODO(pabelanger): Why is python-requests installed from pip?
sudo rm -rf /usr/lib/python2.7/site-packages/requests /usr/lib/python2.7/site-packages/urllib3
sudo rpm -e --nodeps python-requests python-urllib3 || :
sudo rpm -e --nodeps python2-requests python2-urllib3 || :
# TODO(amoralej): remove after https://review.openstack.org/#/c/468872/ is merged
sudo pip uninstall certifi -y || true
sudo pip uninstall urllib3 -y || true
sudo pip uninstall requests -y || true
sudo rpm -e --nodeps python2-certifi || :
sudo rpm -e --nodeps python2-urllib3 || :
sudo rpm -e --nodeps python2-requests || :
sudo yum -y install python-requests python-urllib3
# JOB_NAME used to be available from jenkins, we need to create it ourselves until

11
toci_gate_test-orig.sh
View File

@ -27,10 +27,15 @@ sudo yum clean all
# NOTE(pabelanger): Current hack to make centos-7 dib work.
# TODO(pabelanger): Why is python-requests installed from pip?
sudo rm -rf /usr/lib/python2.7/site-packages/requests /usr/lib/python2.7/site-packages/urllib3
sudo rpm -e --nodeps python-requests python-urllib3 || :
sudo rpm -e --nodeps python2-requests python2-urllib3 || :
# TODO(amoralej): remove after https://review.openstack.org/#/c/468872/ is merged
sudo pip uninstall certifi -y || true
sudo pip uninstall urllib3 -y || true
sudo pip uninstall requests -y || true
sudo rpm -e --nodeps python2-certifi || :
sudo rpm -e --nodeps python2-urllib3 || :
sudo rpm -e --nodeps python2-requests || :
sudo yum -y install python-requests python-urllib3
# Remove metrics from a previous run
rm -f /tmp/metric-start-times /tmp/metrics-data

10
toci_instack_osinfra.sh
View File

@ -44,9 +44,13 @@ dummy_ci_repo
$TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --repo-setup
# Install some useful/necessary packages
sudo rm -rf /usr/lib/python2.7/site-packages/requests /usr/lib/python2.7/site-packages/urllib3
sudo rpm -e --nodeps python-requests python-urllib3 || :
sudo rpm -e --nodeps python2-requests python2-urllib3 || :
# TODO(amoralej): remove after https://review.openstack.org/#/c/468872/ is merged
sudo pip uninstall certifi -y || true
sudo pip uninstall urllib3 -y || true
sudo pip uninstall requests -y || true
sudo rpm -e --nodeps python2-certifi || :
sudo rpm -e --nodeps python2-urllib3 || :
sudo rpm -e --nodeps python2-requests || :
sudo yum -y install python-requests python-urllib3
# Open up port for delorean yum repo server
sudo iptables -I INPUT -p tcp --dport 8766 -j ACCEPT