summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-12 14:17:33 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-03-12 14:17:33 +0100
commite91a6ccc3f17b240bd1f60e613e00a29890b5bfa (patch)
tree71184e6e440a5fc1572382fb96f9127c950e8e93
parent822d2780d4987441b7f379ca670f4c8e9c782489 (diff)
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>
-rwxr-xr-xjjb/xci/xci-start-new-vm.sh2
-rw-r--r--jjb/xci/xci-verify-jobs.yml3
2 files changed, 1 insertions, 4 deletions
diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index c2f1f991f..030a0dfba 100755
--- 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 c95917f09..4c9ff9e69 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -238,9 +238,6 @@
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
description: 'Git URL to use on this Jenkins Slave'