Override GIT_BASE parameter for orange-build

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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 9412bc2..1f284f0 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -7,6 +7,7 @@
     pod:
         - 'opnfv-jump-1'
         - 'opnfv-jump-2'
+        - 'orange-build'
     jobs:
         - 'functest-{pod}'
         - 'set-functest-env-{pod}'
@@ -211,6 +212,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - '{pod}'
 
     scm:
         - git-scm:
@@ -226,6 +228,8 @@
 
     builders:
         - 'functest-all'
+        - 'functest-store-results'
+        - 'functest-cleanup'
 
 - job-template:
     name: 'functest-daily-{stream}'
@@ -388,6 +392,29 @@
             default: '{gs-pathname}'
             description: "Version directory where the opnfv documents will be stored in gs repository"
 
+- parameter:
+    name: orange-build
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
+
+- parameter:
+    name: opnfv-jump-1
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Override GIT_BASE"
+
+- parameter:
+    name: opnfv-jump-2
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Override GIT_BASE"
 ########################
 # trigger macros
 ########################
@@ -401,6 +428,9 @@
     triggers:
         - pollscm: "H 21 * * *"
 
+########################
+# builder macros
+########################
 # macros
 - builder:
     name: functest-all
@@ -443,13 +473,23 @@
             mkdir -p $HOME/functest/results
 
             # save ODL results
-            cp -Rf $WORSPACE/testcases/Controllers/ODL/CI/logs $HOME/functest/results/ODL
+            cp -Rf $WORKSPACE/testcases/Controllers/ODL/CI/logs $HOME/functest/results/ODL
 
             # save tempest.conf for further troubleshooting
             cp $HOME/.rally/tempest/for-deployment-*/tempest.conf $HOME/functest/results
-            
-            # push results to artifact
+
+- builder:
+    name: functest-store-results
+    builders:
+        - shell:
             !include-raw res-build.sh
 
+- builder:
+    name: functest-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+            set +e
+
             # cleanup
             python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean