X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=a688cab29cfdd1d2257d024a467383831745caf3;hb=32408dd6f7506a2a791bd5c00bf7cd9509961a07;hp=8e3de3d75f959b980705683329f63ba0ad7cb2e5;hpb=3b0bcece3e95a3e020d0cfd9014219a075502fb1;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 8e3de3d75..a688cab29 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -14,8 +14,8 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         docker-tag: 'stable'
@@ -40,11 +40,11 @@
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            <<: *colorado
+            <<: *danube
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -57,11 +57,11 @@
         - baremetal:
             slave-label: joid-baremetal
             installer: joid
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: joid-virtual
             installer: joid
-            <<: *colorado
+            <<: *danube
 # compass CI PODs
         - baremetal:
             slave-label: compass-baremetal
@@ -74,11 +74,11 @@
         - baremetal:
             slave-label: compass-baremetal
             installer: compass
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             installer: compass
-            <<: *colorado
+            <<: *danube
 # apex CI PODs
         - apex-verify-master:
             slave-label: '{pod}'
@@ -88,14 +88,36 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - apex-verify-colorado:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *colorado
-        - apex-daily-colorado:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *colorado
+#        - apex-verify-danube:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *danube
+#        - apex-daily-danube:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *danube
+# 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
+            <<: *danube
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *danube
+# 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
@@ -127,6 +153,10 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
+        - zte-pod1:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -135,10 +165,23 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - arm-pod1:
+        - zte-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
+        - arm-pod2:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *danube
+        - arm-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
+# PODs for verify jobs triggered by each patch upload
+        - ool-virtual1:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -161,6 +204,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -176,6 +220,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
@@ -186,14 +232,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:
@@ -239,6 +286,10 @@
                 - 'vims'
                 - 'multisite'
                 - 'parser'
+        - string:
+            name: TESTCASE_OPTIONS
+            default: ''
+            description: 'Additional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
@@ -258,6 +309,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
 ########################
@@ -276,6 +331,7 @@
         - 'set-functest-env'
         - 'functest-daily'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-weekly-builder
@@ -284,6 +340,7 @@
         - 'set-functest-env'
         - 'functest-weekly'
         - 'functest-store-results'
+        - 'functest-exit'
 
 - builder:
     name: functest-suite-builder
@@ -327,3 +384,9 @@
     builders:
         - shell:
             !include-raw: ./functest-cleanup.sh
+
+- builder:
+    name: functest-exit
+    builders:
+        - shell:
+            !include-raw: ./functest-exit.sh