summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-09-26 12:33:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-26 12:33:12 +0000
commit116764c00f99e279d95f73a7077a219698195341 (patch)
tree87d97561886d0997bc8a597ecec8105d4fc41ef6 /jjb/xci
parent8e72b68b83fac5417fe78a3a9f3b416b72aca129 (diff)
parent7b226cff48d860a331d9b2b6826a1ea6cf58ed45 (diff)
Merge "jjb: xci: Create XCI test script"
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/xci-verify-jobs.yml28
1 files changed, 25 insertions, 3 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index aac89f2a1..59fdf841c 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -231,6 +231,28 @@
fi
cd $WORKSPACE
+
+ # The start-new-vm.sh script will copy the entire releng-xci directory
+ # so lets prepare the test script now so it can be copied by the script.
+ # Please do not move it elsewhere or you would have to move it to the VM
+ # yourself.
+ cat > xci_test.sh<<EOF
+ #!/bin/bash
+ export DISTRO=$DISTRO
+ export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ export FUNCTEST_MODE=$FUNCTEST_MODE
+ 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 INSTALLER_TYPE=$INSTALLER_TYPE
+ export GIT_BASE=$GIT_BASE
+ export JENKINS_HOME=$JENKINS_HOME
+
+ cd releng-xci/xci
+ ./xci-deloy.sh
+ EOF
+
./xci/scripts/vm/start-new-vm.sh $DISTRO
- shell: |
#!/bin/bash
@@ -241,7 +263,7 @@
exit 0
fi
- ssh ${DISTRO}_xci_vm "cd releng-xci/xci && ./xci-deploy.sh"
+ ssh ${{DISTRO}}_xci_vm "cd releng-xci && ./xci_test.sh"
- builder:
@@ -266,8 +288,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: