X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;fp=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=453451f52d5a01298f4a2eda7a3575d5ed9cf9d1;hb=ee16d3e0f24b32f4b934af12d62bd47b69dbf759;hp=6b10693627d2d36d6f1b91f1ac5205d8810e1128;hpb=2973259cac6b38639835a9ce86441bda06b78904;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 6b1069362..453451f52 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -117,18 +117,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
-      - string:
-          name: INSTALLER_VERSION
-          default: ''
-      - string:
-          name: UPSTREAM_JOB_NAME
-          default: ''
-      - string:
-          name: UPSTREAM_BUILD_ID
-          default: ''
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
 
@@ -201,8 +190,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'daisy.*-deploy-({pod})?-daily-.*'
             - 'daisy-kolla-build-.*'
+            - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
+            - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
           block-level: 'NODE'
 
     parameters:
@@ -212,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: