xci: Combine vars setting installer type in INSTALLER_TYPE

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

diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index 5e97b8b..79b31bf 100755 (executable)
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -111,10 +111,10 @@ fi
 # set the installer
 case ${DEPLOY_SCENARIO[0]} in
     os-*)
-        XCI_INSTALLER=osa
+        INSTALLER_TYPE=osa
         ;;
     k8-*)
-        XCI_INSTALLER=kubespray
+        INSTALLER_TYPE=kubespray
         ;;
     *)
         echo "Unable to determine the installer. Exiting!"
@@ -124,8 +124,8 @@ esac
 
 # save the installer and scenario names into java properties file
 # so they can be injected to downstream jobs via envInject
-echo "Recording the installer '$XCI_INSTALLER' and scenario '${DEPLOY_SCENARIO[0]}' for downstream jobs"
-echo "XCI_INSTALLER=$XCI_INSTALLER" > $WORK_DIRECTORY/scenario.properties
+echo "Recording the installer '$INSTALLER_TYPE' and scenario '${DEPLOY_SCENARIO[0]}' for downstream jobs"
+echo "INSTALLER_TYPE=$INSTALLER_TYPE" > $WORK_DIRECTORY/scenario.properties
 echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> $WORK_DIRECTORY/scenario.properties
 
 # skip the deployment if the scenario is not supported on this distro

diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index 030a0df..c2f1f99 100755 (executable)
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -57,7 +57,7 @@ export CORE_OPENSTACK_INSTALL=true
 export BIFROST_USE_PREBUILT_IMAGES=true
 export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
 export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
-export INSTALLER_TYPE=$XCI_INSTALLER
+export INSTALLER_TYPE=$INSTALLER_TYPE
 export GIT_BASE=$GIT_BASE
 export JENKINS_HOME=$JENKINS_HOME