From 7b226cff48d860a331d9b2b6826a1ea6cf58ed45 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 26 Sep 2017 08:35:47 +0100
Subject: jjb: xci: Create XCI test script

We need to respect the environment during testing so we need to create
a proper test script which exports all the variables that matter for our
tests. We do that before we create the VM so the VM creation script can
rsync the test for us. We also properly escape the DISTRO variable when
destroying the VM.

Change-Id: Ic3fff40868155af31762e458c1faee24354c0712
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 jjb/xci/xci-verify-jobs.yml | 28 +++++++++++++++++++++++++---
 1 file 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:
-- 
cgit 1.2.3-korg