Add pip installation to base image

Also add pip installation to image builder script

Change-Id: I2f412758f18dc74d47db60e2cc7d2f8827f3e4d9

diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
index e19275648b9b2117e92569b225fb27dbe6199dcd..56073dfcab35f5d69d286ec3a180df664bd42564 100644 (file)
--- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
@@ -37,6 +37,8 @@ ubuntu-vm-builder \
 bridge-utils \
 python-seed-client
 
+pip install virtualenv
+
 wget -O /home/jenkins/jenkins-swarm-client.jar https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/3.9/swarm-client-3.9.jar
 mkdir /etc/jenkins-agent
 echo "base-slave" > /etc/jenkins-agent/labels

diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
index c25f5bd77947d36a171652ccb1c9006100ce785d..db9c35cd2e4c2a8e48bb736e9565c8e583a3290c 100755 (executable)
--- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh
+++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
@@ -69,6 +69,7 @@ set +x
 source "${OPENRC_FILE?}"
 OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}"
 if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then
+  pip install virtualenv
   virtualenv "${OPENSTACK_CLIENTS_VENV}"
   source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
   pip install openstackclient