From 2e7e5df9e022e04c34d2b7b6c0bc9961c90b2080 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Thu, 22 Apr 2021 15:03:41 +0400 Subject: [PATCH] Remove venv condition for image build Change-Id: Ib7d4b8087c28fdda0909b2641c67ad5f7da2980c --- .../scripts/prepare_build_upload_image.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh index 619785e..387a3d7 100755 --- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh +++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh @@ -78,19 +78,14 @@ fi set +x 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 virtualenv +virtualenv "${OPENSTACK_CLIENTS_VENV}" +source "${OPENSTACK_CLIENTS_VENV}"/bin/activate pip install -U "python-openstackclient<4.0.0" sed -i 's/import queue/import Queue as queue/' "${OPENSTACK_CLIENTS_VENV}"/lib/python2.7/site-packages/openstack/cloud/openstackcloud.py sed -i 's/import queue/import Queue as queue/' "${OPENSTACK_CLIENTS_VENV}"/lib/python2.7/site-packages/openstack/utils.py - deactivate -fi -source "${OPENSTACK_CLIENTS_VENV}"/bin/activate - -set -x -echo "Using ${OS_AUTH_URL?} endpoint" -openstack image delete "${GLANCE_IMAGE_NAME}" || true -openstack image create --min-disk 6 --disk-format qcow2 --container-format bare --file xenial-server-cloudimg-amd64-disk1.img "${GLANCE_IMAGE_NAME}" + set -x + echo "Using ${OS_AUTH_URL?} endpoint" + openstack image delete "${GLANCE_IMAGE_NAME}" || true + openstack image create --min-disk 6 --disk-format qcow2 --container-format bare --file xenial-server-cloudimg-amd64-disk1.img "${GLANCE_IMAGE_NAME}" deactivate \ No newline at end of file -- 2.45.2