commit 63460040889e286d34a20742687748f77151f30b
author Dennis Dmitriev <ddmitriev@mirantis.com> Tue Dec 11 13:08:11 2018 +0200
committer Dennis Dmitriev <ddmitriev@mirantis.com> Tue Dec 11 13:09:05 2018 +0200
tree efd3abec165788df7d6b5ade0b876bbed043725b
parent f495777708f3b60bae1b4470405b54118b826085

Fix "swarm_bootstrap_salt_cluster_devops" env var defaults

Change-Id: Ied3c185d885724ea7ce294f0b3cfb02f49707e77

src/com/mirantis/system_qa/SharedPipeline.groovy

diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index 9e9a044..3d62bc7 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -159,6 +159,10 @@
         def pipeline_library_ref = env.PIPELINE_LIBRARY_REF ?: ''
         def cookiecutter_ref_change = env.COOKIECUTTER_REF_CHANGE ?: ''
         def environment_template_ref_change = env.ENVIRONMENT_TEMPLATE_REF_CHANGE ?: ''
+        def env_ipmi_user = env.IPMI_USER ?: ''
+        def env_ipmi_pass = env.IPMI_PASS ?: ''
+        def env_lab_mgm_iface = env.LAB_MANAGEMENT_IFACE ?: ''
+        def env_lab_ctl_iface = env.LAB_CONTROL_IFACE ?: ''
         def parameters = [
                 string(name: 'PARENT_NODE_NAME', value: "${NODE_NAME}"),
                 string(name: 'PARENT_WORKSPACE', value: pwd()),
@@ -175,10 +179,10 @@
                 string(name: 'SALT_MODELS_SYSTEM_COMMIT', value: "${salt_models_system_commit}"),
                 string(name: 'COOKIECUTTER_REF_CHANGE', value: "${cookiecutter_ref_change}"),
                 string(name: 'ENVIRONMENT_TEMPLATE_REF_CHANGE', value: "${environment_template_ref_change}"),
-                string(name: 'IPMI_USER', value: env.IPMI_USER),
-                string(name: 'IPMI_PASS', value: env.IPMI_PASS),
-                string(name: 'LAB_MANAGEMENT_IFACE', value: "${LAB_MANAGEMENT_IFACE}"),
-                string(name: 'LAB_CONTROL_IFACE', value: "${LAB_CONTROL_IFACE}"),
+                string(name: 'IPMI_USER', value: env_ipmi_user),
+                string(name: 'IPMI_PASS', value: env_ipmi_pass),
+                string(name: 'LAB_MANAGEMENT_IFACE', value: env_lab_mgm_iface),
+                string(name: 'LAB_CONTROL_IFACE', value: env_lab_ctl_iface),
                 booleanParam(name: 'SHUTDOWN_ENV_ON_TEARDOWN', value: false),
             ]