commit 369cb5e3feb8d7261d75a8d714e92c9e59538c74
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed May 22 15:30:34 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed May 22 15:30:34 2019 +0000
tree aa22e749e67a8ee53618bd42fc1a91ef9b578660
parent ae777d5ae0158e9b3853064dcc9b9f0daef818d5
parent 22581004a0df2922d76032588e441a77f97c3ab0

Merge "[CVP,master] Use cid node by default to run rally-based pipelines"

cvp-func.groovy

diff --git a/cvp-func.groovy b/cvp-func.groovy
index 31a412b..80160ab 100644
--- a/cvp-func.groovy
+++ b/cvp-func.groovy
@@ -31,6 +31,10 @@
     try{
         stage('Initialization') {
             sh "rm -rf ${artifacts_dir}"
+            if (!TARGET_NODE) {
+              // This pillar will return us cid01
+              TARGET_NODE = "I@gerrit:client"
+            }
             saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
             os_version=salt.getPillar(saltMaster, 'I@salt:master', '_param:openstack_version')['return'][0].values()[0]
             if (!os_version) {

cvp-ha.groovy

diff --git a/cvp-ha.groovy b/cvp-ha.groovy
index dbde547..e933984 100644
--- a/cvp-ha.groovy
+++ b/cvp-ha.groovy
@@ -37,6 +37,10 @@
         try {
             stage('Initialization') {
                 sh "rm -rf ${artifacts_dir}"
+                if (!TEMPEST_TARGET_NODE) {
+                  // This pillar will return us cid01
+                  TEMPEST_TARGET_NODE = "I@gerrit:client"
+                }
                 saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
                 os_version=salt.getPillar(saltMaster, 'I@salt:master', '_param:openstack_version')['return'][0].values()[0]
                 if (!os_version) {

cvp-perf.groovy

diff --git a/cvp-perf.groovy b/cvp-perf.groovy
index 127066b..60a064c 100644
--- a/cvp-perf.groovy
+++ b/cvp-perf.groovy
@@ -27,6 +27,10 @@
     try{
         stage('Initialization') {
             sh "rm -rf ${artifacts_dir}"
+            if (!TARGET_NODE) {
+              // This pillar will return us cid01
+              TARGET_NODE = "I@gerrit:client"
+            }
             saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
             os_version=salt.getPillar(saltMaster, 'I@salt:master', '_param:openstack_version')['return'][0].values()[0]
             if (!os_version) {