Unified usings of job workspaces
Change-Id: I461764a11416300f1740e94a990d6f0453248de3
diff --git a/mk-k8s-simple-deploy-pipeline.groovy b/mk-k8s-simple-deploy-pipeline.groovy
index 39ddc9c..2a3653c 100644
--- a/mk-k8s-simple-deploy-pipeline.groovy
+++ b/mk-k8s-simple-deploy-pipeline.groovy
@@ -31,7 +31,6 @@
test = new com.mirantis.mk.Test()
def python = new com.mirantis.mk.Python()
-def pepperEnv = "pepperEnv"
artifacts_dir = "_artifacts"
timeout(time: 12, unit: 'HOURS') {
node {
@@ -41,8 +40,9 @@
// value defaults
def openstackVersion = OPENSTACK_API_CLIENT ? OPENSTACK_API_CLIENT : 'liberty'
- def openstackEnv = "${env.WORKSPACE}/venv"
-
+ def workspace = common.getWorkspace()
+ def openstackEnv = "${workspace}/venv"
+ def pepperEnv = "${workspace}/pepperEnv"
if (HEAT_STACK_NAME == "") {
HEAT_STACK_NAME = BUILD_TAG
}
@@ -56,7 +56,7 @@
}
stage('Connect to OpenStack cloud') {
- openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT,
+ openstackCloud = openstack.createOpenstackEnv(openstackEnv, OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT,
"", OPENSTACK_API_PROJECT_DOMAIN_ID, OPENSTACK_API_USER_DOMAIN_ID, OPENSTACK_API_VERSION)
openstack.getKeystoneToken(openstackCloud, openstackEnv)
}