change test order: set vPing first to avoid side effect from tempest or Rally Bench...

[releng.git] / jjb / functest / functest.yml

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 6bba3cc..d2a5bc9 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -290,6 +290,9 @@
     name: functest-all
     builders:
         - shell: |
+            #!/bin/bash
+            set +e
+
             echo "Functest: prepare Functest environment"
             mkdir -p $HOME/functest/
             source $HOME/functest/opnfv-openrc.sh
@@ -302,29 +305,29 @@
             echo "Functest: prepare Functest environment"
             python $WORKSPACE/testcases/config_functest.py --debug $WORKSPACE/ start
 
+            # vPing
+            echo "Functest: run vPing"
+            python $WORKSPACE/testcases/vPing/CI/libraries/vPing.py --debug $WORKSPACE/
+
+            # ODL
+            echo "Functest: run ODL suite"
+            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+
             # tempest
             echo "Functest: run Tempest suite"
             rally verify start smoke
             rally verify list
 
-            # vPing
-            echo "Functest: run vPing"
-            python $WORKSPACE/testcases/vPing/CI/libraries/vPing.py --debug $WORKSPACE/
-
             # rally
             echo "Functest: run Functest Rally Bench suites"
             python $WORKSPACE/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug $WORKSPACE/ all
 
-            # ODL
-            echo "Functest: run ODL suite"
-            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
-
             # collect results
             echo "Functest: copy results and clean Functest environment"
             mkdir -p $HOME/functest/results
 
             # save tempest.conf for further troubleshooting
-            cp $HOME/.rally/for-deployment-*/tempest.conf $HOME/functest/results
+            cp $HOME/.rally/tempest/for-deployment-*/tempest.conf $HOME/functest/results
 
             # cleanup
             python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean