Fix the wrong pod and job name of Daisy

[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 4920bff..44c2ce5 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -113,6 +113,15 @@
             slave-label: armband-virtual
             installer: fuel
             <<: *danube
+# daisy CI PODs
+        - baremetal:
+            slave-label: daisy-baremetal
+            installer: daisy
+            <<: *master
+        - virtual:
+            slave-label: daisy-virtual
+            installer: daisy
+            <<: *master
 # netvirt 3rd party ci
         - virtual:
             slave-label: odl-netvirt-virtual
@@ -133,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:
@@ -204,6 +213,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -219,7 +229,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults'
@@ -234,7 +243,7 @@
         - string:
             name: CLEAN_DOCKER_IMAGES
             default: 'false'
-            description: 'Remove downloaded docker images (opnfv/functest:*)'
+            description: 'Remove downloaded docker images (opnfv/functest*:*)'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -275,6 +284,7 @@
                 - 'tempest_smoke_serial'
                 - 'rally_sanity'
                 - 'odl'
+                - 'odl_netvirt'
                 - 'onos'
                 - 'promise'
                 - 'doctor'