From 13e69d1069ae972658af62f4ee7a7140fc53e7a3 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Fri, 22 May 2015 20:20:47 +0200
Subject: Refactor functest job execute shell

JIRA: FUNCTEST-7

Change-Id: I8ad0220e05cefbcb754c070315adfbb0d2a1183f
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/functest/functest.yml | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 33297acb3..661dffa78 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -118,6 +118,12 @@
 
     node: '{pod}'
 
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: master
+
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -282,23 +288,39 @@
         - shell: |
             echo "Functest: prepare Functest environment"
             mkdir -p $HOME/functest/
-            rm -f $HOME/functest/config_functest.py
-            rm -f $HOME/functest/functest.yaml
-            wget https://git.opnfv.org/cgit/functest/plain/testcases/config_functest.py -P $HOME/functest/
-            wget https://git.opnfv.org/cgit/functest/plain/testcases/functest.yaml -P $HOME/functest/
             source $HOME/functest/opnfv-openrc.sh
-            python $HOME/functest/config_functest.py -d start
+
+            # WORKSPACE is the root of the functest repo
+            # go into WORKSPACE where the functest repo is cloned
+            cd $WORKSPACE
+
+            # prepare
+            echo "Functest: prepare Functest environment"
+            python $WORKSPACE/testcases/config_functest.py --debug $WORKSPACE/ start
+
+            # tempest
             echo "Functest: run Tempest suite"
             rally verify start smoke
             rally verify list
+
+            # vPing
             echo "Functest: run vPing"
-            python $HOME/.functest/vPing/vPing.py -d
+            python $WORKSPACE/testcases/vPing/CI/libraries/vPing.py --debug $WORKSPACE/
+
+            # rally
             echo "Functest: run Functest Rally Bench suites"
-            python $HOME/.functest/Rally_test/run_rally.py -d all
+            python $WORKSPACE/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug $WORKSPACE/ all
+
+            # ODL
             echo "Functest: run ODL suite"
-            bash $HOME/.functest/ODL/start_tests.sh
+            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+
+            # collect results
             echo "Functest: copy results and clean Functest environment"
             mkdir -p $HOME/functest/results
-            cp $HOME/.functest/Rally_test/results/* $HOME/functest/
-            python $HOME/functest/config_functest.py -d -f clean
 
+            # save tempest.conf for further troubleshooting
+            cp $HOME/.rally/for-deployment-*/tempest.conf $HOME/functest/results
+
+            # cleanup
+            python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean
-- 
cgit 1.2.3-korg