Unified usings of job workspaces
Change-Id: I461764a11416300f1740e94a990d6f0453248de3
diff --git a/build-mirror-image.groovy b/build-mirror-image.groovy
index a3c3122..822d398 100644
--- a/build-mirror-image.groovy
+++ b/build-mirror-image.groovy
@@ -34,7 +34,7 @@
def openstack = new com.mirantis.mk.Openstack()
def date = new Date()
def dateTime = date.format("ddMMyyyy-HHmmss")
-def venvPepper = "venvPepper"
+def venvPepper = ""
def privateKey = ""
def floatingIP = ""
def openstackServer = ""
@@ -62,8 +62,9 @@
node("python&&disk-xl") {
try {
def workspace = common.getWorkspace()
- rcFile = openstack.createOpenstackEnv(OS_URL, OS_CREDENTIALS_ID, OS_PROJECT, "default", "", "default", "2", "")
openstackEnv = String.format("%s/venv", workspace)
+ venvPepper = String.format("%s/venvPepper", workspace)
+ rcFile = openstack.createOpenstackEnv(openstackEnv, OS_URL, OS_CREDENTIALS_ID, OS_PROJECT, "default", "", "default", "2", "")
def openstackVersion = OS_VERSION
VM_IP_DELAY = VM_IP_DELAY as Integer
@@ -227,4 +228,4 @@
}
}
}
-}
\ No newline at end of file
+}