X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=cc2dc5a2f9805574953e503a1c7f5dd0be0f83ac;hb=49ace3aeb59e0046ab3e7115fcaa8bfa78917fc6;hp=fbbb086d72f20c2c2b5f4008111cc3e37f0b0ed0;hpb=ff815ebe413d0db3ee9669ae772bf9d1d2416577;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index fbbb086d7..cc2dc5a2f 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -117,9 +117,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
 
@@ -192,8 +190,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'daisy.*-deploy-({pod})?-daily-.*'
             - 'daisy-kolla-build-.*'
+            - '{installer}-(build|deploy|test)-daily-(euphrates|master)'
+            - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
           block-level: 'NODE'
 
     parameters:
@@ -203,9 +203,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
       - string:
@@ -337,7 +335,7 @@
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
     triggers:
-      - timed: '0 10 * * *'
+      - timed: '0 10,20 * * *'
 # Basic HA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'