From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Thu, 22 Apr 2021 11:03:41 +0000 (+0400)
Subject: Remove venv condition for image build
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F41707%2F2;p=tools%2Fsustaining.git

Remove venv condition for image build

Change-Id: Ib7d4b8087c28fdda0909b2641c67ad5f7da2980c
---

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