X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=e85144c92d3f7a59e33cc3aaf52ddfea67462b2e;hb=c8d812d845c3db31dcab2c5083a3b45df9597ad3;hp=1cded61fcde1fcc33f65ef4014e71f0b20151022;hpb=f6add0a76589049a482308aff810658782f22ea9;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 1cded61fc..e85144c92 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,14 @@
             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
@@ -108,11 +108,25 @@
         - armband-baremetal:
             slave-label: armband-baremetal
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
-            <<: *colorado
+            <<: *danube
+# daisy CI PODs
+        - daisy-baremetal:
+            slave-label: daisy-baremetal
+            installer: daisy
+            <<: *master
+        - daisy-virtual:
+            slave-label: daisy-virtual
+            installer: daisy
+            <<: *master
+# netvirt 3rd party ci
+        - virtual:
+            slave-label: odl-netvirt-virtual
+            installer: netvirt
+            <<: *master
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -128,8 +142,8 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-pod5:
-            slave-label: '{pod}'
+        - baremetal-centos:
+            slave-label: 'intel-pod8'
             installer: compass
             <<: *master
         - nokia-pod1:
@@ -151,7 +165,7 @@
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -163,15 +177,15 @@
         - zte-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - arm-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
 # PODs for verify jobs triggered by each patch upload
         - ool-virtual1:
             slave-label: '{pod}'
@@ -199,6 +213,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -214,6 +229,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
@@ -224,14 +240,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: