Do not break the jenkins job when vPing fails

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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 661dffa..e81976a 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -118,6 +118,10 @@
 
     node: '{pod}'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
@@ -286,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
@@ -320,7 +327,7 @@
             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