Drop OPENSTACK_VENV_PATH

Change-Id: I8bb4d04dfd525a6ed8819e28ecac1a43d218b338

diff --git a/maintenance-ci/common/jobs/delete_stack.yaml b/maintenance-ci/common/jobs/delete_stack.yaml
index c05e7760478111c7994c10605748a900cc0ef11e..9b612d1019c5cb990d4e5ee445cb2e3c7577c1b3 100644 (file)
--- 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 5ddcaaab3e92858e5be5533fedd467ce3a3ac581..a97e919717ee8f1b45b54ed847052c8788e819c6 100644 (file)
--- 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 31862efd795ff8309ee28d0efc029ed3cc3bb66a..38929ede0cf4462295fb339cbd3954036f4fe0e6 100755 (executable)
--- 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 9c3ac2d5875c20ade40a93f742d306a2ff9ef0ac..93ea46b92e8878f93f7c18422f5a087f2fdea12e 100755 (executable)
--- 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