summaryrefslogtreecommitdiffstats
path: root/jjb/xci/xci-set-scenario.sh
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-12 14:30:50 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-03-12 14:30:50 +0100
commit390d637e39cf884663c016fbe2bb7401a62f93f0 (patch)
treecf37b3ddef469f3f324bff147a10ed5b09acde45 /jjb/xci/xci-set-scenario.sh
parent0607b000df049c4e87d114514842c573530c0d19 (diff)
xci: Combine vars setting installer type in INSTALLER_TYPE
Change-Id: I5312ac784b1621ce968bbdfb1532859dada0e790 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/xci/xci-set-scenario.sh')
-rwxr-xr-xjjb/xci/xci-set-scenario.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index 5e97b8b43..79b31bfb0 100755
--- 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