fix ci jobs (daily && no branch param)

[releng.git] / jjb / functest / functest-ci-jobs.yml

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3925450..f8fdeb8 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -96,6 +96,28 @@
             slave-label: '{pod}'
             installer: apex
             <<: *colorado
+# armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *colorado
+# netvirt 3rd party ci
+        - virtual:
+            slave-label: odl-netvirt-virtual
+            installer: netvirt
+            <<: *master
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -111,7 +133,7 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-pod2:
+        - huawei-pod5:
             slave-label: '{pod}'
             installer: compass
             <<: *master
@@ -119,7 +141,11 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod1:
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
+        - arm-pod3:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -143,10 +169,19 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
+        - arm-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
+# PODs for verify jobs triggered by each patch upload
+        - ool-virtual1:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -184,6 +219,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
@@ -194,14 +231,15 @@
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'false'
+            description: 'Remove downloaded docker images (opnfv/functest:*)'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - description-setter:
@@ -247,6 +285,10 @@
                 - 'vims'
                 - 'multisite'
                 - 'parser'
+        - string:
+            name: TESTCASE_OPTIONS
+            default: ''
+            description: 'Additional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
@@ -266,6 +308,10 @@
             name: CI_DEBUG
             default: 'false'
             description: "Show debug output information"
+        - string:
+            name: RC_FILE_PATH
+            default: ''
+            description: "Path to the OS credentials file if given"
 ########################
 # trigger macros
 ########################
@@ -342,4 +388,4 @@
     name: functest-exit
     builders:
         - shell:
-            !include-raw: ./functest-exit.sh
\ No newline at end of file
+            !include-raw: ./functest-exit.sh