Merge "Stop using serial"
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 11ddc84..1b7facb 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -23,6 +23,9 @@
* OPENSTACK_API_URL OpenStack API address
* OPENSTACK_API_CREDENTIALS Credentials to the OpenStack API
* OPENSTACK_API_PROJECT OpenStack project to connect to
+ * OPENSTACK_PROJECT_DOMAIN Domain for OpenStack project
+ * OPENSTACK_PROJECT_ID ID for OpenStack project
+ * OPENSTACK_USER_DOMAIN Domain for OpenStack user
* OPENSTACK_API_CLIENT Versions of OpenStack python clients
* OPENSTACK_API_VERSION Version of the OpenStack API (2/3)
*
@@ -53,11 +56,25 @@
salt = new com.mirantis.mk.Salt()
test = new com.mirantis.mk.Test()
+
+
+
_MAX_PERMITTED_STACKS = 2
overwriteFile = "/srv/salt/reclass/classes/cluster/overwrite.yml"
timestamps {
node {
+ // try to get STACK_INSTALL or fallback to INSTALL if exists
+ try {
+ def temporary = STACK_INSTALL
+ } catch (MissingPropertyException e) {
+ try {
+ STACK_INSTALL = INSTALL
+ env['STACK_INSTALL'] = INSTALL
+ } catch (MissingPropertyException e2) {
+ common.errorMsg("Property STACK_INSTALL or INSTALL not found!")
+ }
+ }
try {
//
// Prepare machines
@@ -94,7 +111,11 @@
// create openstack env
openstack.setupOpenstackVirtualenv(openstackEnv, openstackVersion)
- openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT)
+ openstackCloud = openstack.createOpenstackEnv(
+ OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS,
+ OPENSTACK_API_PROJECT,OPENSTACK_PROJECT_DOMAIN,
+ OPENSTACK_PROJECT_ID, OPENSTACK_USER_DOMAIN,
+ OPENSTACK_API_VERSION)
openstack.getKeystoneToken(openstackCloud, openstackEnv)
//
// Verify possibility of create stack for given user and stack type
@@ -168,21 +189,21 @@
}
// Overwrite Calico vars if specified
if (env.getEnvironment().containsKey("CALICO_CNI_IMAGE")) {
- salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_calico_cni_image: ${CALICO_CNI_IMAGE}")
+ salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_calico_cni_image: ${CALICO_CNI_IMAGE}")
}
if (env.getEnvironment().containsKey("CALICO_NODE_IMAGE")) {
- salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_calico_node_image: ${CALICO_NODE_IMAGE}")
+ salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_calico_node_image: ${CALICO_NODE_IMAGE}")
}
if (env.getEnvironment().containsKey("CALICOCTL_IMAGE")) {
- salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_calicoctl_image: ${CALICOCTL_IMAGE}")
+ salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_calicoctl_image: ${CALICOCTL_IMAGE}")
}
// Overwrite netchecker vars if specified
if (env.getEnvironment().containsKey("NETCHECKER_AGENT_IMAGE")) {
- salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_netchecker_agent_image: ${NETCHECKER_AGENT_IMAGE}")
+ salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_netchecker_agent_image: ${NETCHECKER_AGENT_IMAGE}")
}
if (env.getEnvironment().containsKey("NETCHECKER_SERVER_IMAGE")) {
- salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_netchecker_server_image: ${NETCHECKER_SERVER_IMAGE}")
+ salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, " kubernetes_netchecker_server_image: ${NETCHECKER_SERVER_IMAGE}")
}
diff --git a/mk-k8s-simple-deploy-pipeline.groovy b/mk-k8s-simple-deploy-pipeline.groovy
index 4aae816..b86e6da 100644
--- a/mk-k8s-simple-deploy-pipeline.groovy
+++ b/mk-k8s-simple-deploy-pipeline.groovy
@@ -55,7 +55,7 @@
stage('Connect to OpenStack cloud') {
openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT,
- OPENSTACK_API_PROJECT_DOMAIN_ID, OPENSTACK_API_USER_DOMAIN_ID)
+ "", OPENSTACK_API_PROJECT_DOMAIN_ID, OPENSTACK_API_USER_DOMAIN_ID, OPENSTACK_API_VERSION)
openstack.getKeystoneToken(openstackCloud, openstackEnv)
}