commit ecff2874504b59c5472d36ce60448b6d38949bb1
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Nov 19 14:24:53 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Nov 19 14:24:53 2019 +0000
tree 5a5c8b818dbdeb07498a0c549fe398a7ec69844f
parent 6b05a85410e2d49c3239ee8f022372d7ad4ec811
parent e4fd729de56394f2a7d653df30bce368f09ffae0

Merge "[CVP-Sanity] Override nested params of global config in Jenkins"

cvp-runner.groovy

diff --git a/cvp-runner.groovy b/cvp-runner.groovy
index edbe902..13f41ea 100644
--- a/cvp-runner.groovy
+++ b/cvp-runner.groovy
@@ -16,6 +16,7 @@
 
 def EXTRA_PARAMS = readYaml(text: env.getProperty('EXTRA_PARAMS')) ?: [:]
 def env_vars = EXTRA_PARAMS.get("envs") ?: []
+def override_config = env.getProperty('EXTRA_PARAMS') ?: ""
 
 def IMAGE = (env.getProperty('IMAGE')) ?: 'docker-prod-local.docker.mirantis.net/mirantis/cvp/cvp-sanity-checks:stable'
 def SLAVE_NODE = (env.getProperty('SLAVE_NODE')) ?: 'docker'
@@ -62,7 +63,8 @@
                     "SALT_USERNAME=${creds.username}",
                     "SALT_PASSWORD=${creds.password}",
                     "SALT_URL=${SALT_MASTER_URL}",
-                    "REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt"
+                    "REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt",
+                    "OVERRIDE_CONFIG=${override_config}"
                     ] + env_vars
 
                 // Generating final config