change order of the tests (avoid start with bench tests because of doubt on cleaning...

JIRA: FUNCTEST-9

Change-Id: If7718c1429312193e549e1cf9447b2540b844970
Signed-off-by: morganrOL <morgan.richomme@orange.com>

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 34c4241..33297ac 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -288,15 +288,15 @@
             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
-            echo "Functest: run Functest Rally Bench suites"
-            python $HOME/.functest/Rally_test/run_rally.py -d all
             echo "Functest: run Tempest suite"
             rally verify start smoke
             rally verify list
             echo "Functest: run vPing"
             python $HOME/.functest/vPing/vPing.py -d
+            echo "Functest: run Functest Rally Bench suites"
+            python $HOME/.functest/Rally_test/run_rally.py -d all
             echo "Functest: run ODL suite"
-            $HOME/.functest/ODL/start_tests.sh
+            bash $HOME/.functest/ODL/start_tests.sh
             echo "Functest: copy results and clean Functest environment"
             mkdir -p $HOME/functest/results
             cp $HOME/.functest/Rally_test/results/* $HOME/functest/