X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fdaisy4nfv%2Fdaisy4nfv-merge-jobs.yml;h=95e72e5500ee1b48347a38fd2cbd76c7497c9207;hb=refs%2Fchanges%2F21%2F32821%2F5;hp=a6659b2bff8ab063df0e0b94b51c06b0f49b8316;hpb=a7d6727b96e3244b55106481275686f59487036b;p=releng.git

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index a6659b2bf..95e72e550 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -84,6 +84,7 @@
                         pattern: 'code/**'
                       - compare-type: ANT
                         pattern: 'deploy/**'
+                  disable-strict-forbidden-file-verification: 'true'
                   forbidden-file-paths:
                       - compare-type: ANT
                         pattern: 'docs/**'
@@ -147,7 +148,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{alias}-merge-deploy-.*'
+                - '{alias}-(merge|verify)-.*'
+                - '{project}-daily-.*'
             block-level: 'NODE'
 
     scm:
@@ -193,7 +195,7 @@
         - shell:
             !include-raw: ./daisy4nfv-download-artifact.sh
         - shell:
-            !include-raw: ./daisy4nfv-virtual-deploy.sh
+            !include-raw: ./daisy-deploy.sh
         - shell:
             !include-raw: ./daisy4nfv-workspace-cleanup.sh