From cc5d66b8fcd58656b0128cb2d2d19fe6bbf27bf6 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 18 Feb 2019 10:54:15 +0400 Subject: [PATCH] Drop OPENSTACK_VENV_PATH Change-Id: I8bb4d04dfd525a6ed8819e28ecac1a43d218b338 --- maintenance-ci/common/jobs/delete_stack.yaml | 4 ---- maintenance-ci/common/jobs/deploy_stack.yaml | 4 ---- maintenance-ci/common/scripts/delete_heat_stack.sh | 2 ++ maintenance-ci/common/scripts/deploy_heat_stack.sh | 2 ++ 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/maintenance-ci/common/jobs/delete_stack.yaml b/maintenance-ci/common/jobs/delete_stack.yaml index c05e776..9b612d1 100644 --- a/maintenance-ci/common/jobs/delete_stack.yaml +++ b/maintenance-ci/common/jobs/delete_stack.yaml @@ -19,10 +19,6 @@ All stacks named with prefix on name's start will be deleted. Used only if STACK_NAME is not defined default: "" - - string: - name: OPENSTACK_CLIENTS_VENV - default: /home/jenkins/venv-openstack-clients - description: Path to venv with openstack clients inside wrappers: diff --git a/maintenance-ci/common/jobs/deploy_stack.yaml b/maintenance-ci/common/jobs/deploy_stack.yaml index 5ddcaaa..a97e919 100644 --- a/maintenance-ci/common/jobs/deploy_stack.yaml +++ b/maintenance-ci/common/jobs/deploy_stack.yaml @@ -24,10 +24,6 @@ - string: name: JENKINS_LABELS default: '' - - string: - name: OPENSTACK_CLIENTS_VENV - default: /home/jenkins/venv-openstack-clients - description: Path to venv with openstack clients inside scm: - git: diff --git a/maintenance-ci/common/scripts/delete_heat_stack.sh b/maintenance-ci/common/scripts/delete_heat_stack.sh index 31862ef..38929ed 100755 --- a/maintenance-ci/common/scripts/delete_heat_stack.sh +++ b/maintenance-ci/common/scripts/delete_heat_stack.sh @@ -2,6 +2,8 @@ set -ex +OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}" + if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then virtualenv "${OPENSTACK_CLIENTS_VENV}" source "${OPENSTACK_CLIENTS_VENV}"/bin/activate diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh index 9c3ac2d..93ea46b 100755 --- a/maintenance-ci/common/scripts/deploy_heat_stack.sh +++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh @@ -2,6 +2,8 @@ set -ex +OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}" + if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then virtualenv "${OPENSTACK_CLIENTS_VENV}" source "${OPENSTACK_CLIENTS_VENV}"/bin/activate -- 2.45.2