Unified usings of job workspaces
Change-Id: I461764a11416300f1740e94a990d6f0453248de3
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index cda022b..989d130 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -91,8 +91,9 @@
node(slave_node) {
try {
// Set build-specific variables
- venv = "${env.WORKSPACE}/venv"
- venvPepper = "${env.WORKSPACE}/venvPepper"
+ def workspace = common.getWorkspace()
+ venv = "${workspace}/venv"
+ venvPepper = "${workspace}/venvPepper"
//
// Prepare machines
@@ -136,7 +137,7 @@
// create openstack env
openstack.setupOpenstackVirtualenv(venv, OPENSTACK_API_CLIENT)
- openstackCloud = openstack.createOpenstackEnv(
+ openstackCloud = openstack.createOpenstackEnv(venv,
OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS,
OPENSTACK_API_PROJECT, OPENSTACK_API_PROJECT_DOMAIN,
OPENSTACK_API_PROJECT_ID, OPENSTACK_API_USER_DOMAIN,