Update block parameters

[releng.git] / jjb / daisy4nfv / daisy4nfv-merge-jobs.yml

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 95d851c..9e7b867 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -29,7 +29,7 @@
         - 'build':
             slave-label: 'opnfv-build-centos'
         - 'deploy-virtual':
-            slave-label: 'opnfv-build-centos'
+            slave-label: 'daisy-virtual'
 #####################################
 # jobs
 #####################################
@@ -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,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{alias}-merge-deploy-.*'
+                - '{alias}-merge-(master|danube)'
             block-level: 'NODE'
 
     scm: