xci: Set installer type for the tested scenario

Variables injected by envInject are set after the job variables
which results in not setting the variable correctly. The Jenkins
test script now uses the variable injected by envInject to set
the INSTALLER_TYPE to XCI_INSTALLER.

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

diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index c2f1f99..030a0df 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=$INSTALLER_TYPE
+export INSTALLER_TYPE=$XCI_INSTALLER
 export GIT_BASE=$GIT_BASE
 export JENKINS_HOME=$JENKINS_HOME
 

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index c95917f..4c9ff9e 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -237,9 +237,6 @@
       - string:
           name: OPNFV_RELENG_DEV_PATH
           default: $WORKSPACE/
-      - string:
-          name: INSTALLER_TYPE
-          default: $XCI_INSTALLER
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT