Rename var XCI_LOOP to CI_LOOP to align with Functest

Change-Id: If5c5b828312dc588515589b8075b9754537b8f86
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 0bca26a..fbe2e20 100644 (file)
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -123,7 +123,7 @@
           name: SLAVE_LABEL
           default: '{slave-label}'
       - string:
-          name: XCI_LOOP
+          name: CI_LOOP
           default: 'periodic'
 
     wrappers:

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index e4c2d0e..b662bd1 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -122,7 +122,7 @@
           name: SLAVE_LABEL
           default: 'xci-virtual'
       - string:
-          name: XCI_LOOP
+          name: CI_LOOP
           default: 'verify'
 
     scm:

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index a953749..a92e490 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -113,7 +113,7 @@
           name: SLAVE_LABEL
           default: '{slave-label}'
       - string:
-          name: XCI_LOOP
+          name: CI_LOOP
           default: 'daily'
 
     triggers:
@@ -131,7 +131,7 @@
             predefined-parameters: |
               DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               XCI_FLAVOR=$XCI_FLAVOR
-              XCI_LOOP=$XCI_LOOP
+              CI_LOOP=$CI_LOOP
             same-node: true
             block: true
       - trigger-builds:
@@ -140,7 +140,7 @@
             predefined-parameters: |
               DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               XCI_FLAVOR=$XCI_FLAVOR
-              XCI_LOOP=$XCI_LOOP
+              CI_LOOP=$CI_LOOP
             same-node: true
             block: true
             block-thresholds:
@@ -214,7 +214,7 @@
           name: SLAVE_LABEL
           default: '{slave-label}'
       - string:
-          name: XCI_LOOP
+          name: CI_LOOP
           default: 'daily'
       - string:
           name: INSTALLER_TYPE

diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 211d282..71cf96d 100755 (executable)
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -15,14 +15,14 @@ cd $WORKSPACE/xci
 
 # for daily jobs, we want to use working versions
 # for periodic jobs, we will use whatever is set in the job, probably master
-if [[ "$XCI_LOOP" == "daily" ]]; then
+if [[ "$CI_LOOP" == "daily" ]]; then
     # source pinned-vars to get releng version
     source ./config/pinned-versions
 
     # checkout the version
     git checkout -q $OPNFV_RELENG_VERSION
     echo "Info: Using $OPNFV_RELENG_VERSION"
-elif [[ "$XCI_LOOP" == "periodic" ]]; then
+elif [[ "$CI_LOOP" == "periodic" ]]; then
     echo "Info: Using $OPNFV_RELENG_VERSION"
 fi
 
@@ -31,7 +31,7 @@ fi
 # to take this into account while deploying anyways
 # clone openstack-ansible
 # stable/ocata already use pinned versions so this is only valid for master
-if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
+if [[ "$CI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
     cd $WORKSPACE
     # get the url to openstack-ansible git
     source ./config/env-vars