diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-26 13:46:49 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-09-26 15:00:11 +0100 |
| commit | 811e40d74c51537b0c546bec3c244eb9e77c4ca7 (patch) | |
| tree | dddaee1c71b4455fd2889e70f361a8fd8992e42b /jjb | |
| parent | 116764c00f99e279d95f73a7077a219698195341 (diff) | |
jjb: xci: xci-verify-jobs: Fix clean VM job
According to
https://docs.openstack.org/infra/jenkins-job-builder/definition.html#macro-notes
we only need to use ${{x}} when the macro has parameters. However, none
of our macros has so the correct way to use the shell variable is ${x}.
Moreover, we set the missing execute bit in the jenkins test script.
Additionally, we fix the OPNFV_RELENG_DEV_PATH parameter to point to the
directory inside the VM where the releng-xci repo is located.
Finally we fix the parent directory in which the test is executed.
Change-Id: Ic6157caa5042274a3a3d0de276bdacc15a90a82d
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 59fdf841c..0e79bd954 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -244,14 +244,15 @@ export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME export XCI_FLAVOR=$XCI_FLAVOR export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES - export OPNFV_RELENG_DEV_PATH=$OPNFV_RELENG_DEV_PATH + export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/ export INSTALLER_TYPE=$INSTALLER_TYPE export GIT_BASE=$GIT_BASE export JENKINS_HOME=$JENKINS_HOME - cd releng-xci/xci - ./xci-deloy.sh + cd xci + ./xci-deploy.sh EOF + chmod a+x xci_test.sh ./xci/scripts/vm/start-new-vm.sh $DISTRO - shell: | @@ -263,7 +264,7 @@ exit 0 fi - ssh ${{DISTRO}}_xci_vm "cd releng-xci && ./xci_test.sh" + ssh ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh" - builder: @@ -288,8 +289,8 @@ exit 0 fi - sudo virsh destroy ${{DISTRO}}_xci_vm - sudo virsh undefine ${{DISTRO}}_xci_vm + sudo virsh destroy ${DISTRO}_xci_vm + sudo virsh undefine ${DISTRO}_xci_vm # this will be enabled once the xci is prepared #- builder: |