X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-project-jobs.yml;h=52769ca88eaf15fdf696f5cf13b5a8c26be78ed7;hb=ac3f798b30ba5d8dcd13b41b309c530dd68ff520;hp=f712adb0a5eb968b9df1a31d96233184241a3f46;hpb=f262b532623812aa4002e44bfcce7d392a8f156b;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index f712adb0a..52769ca88 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -23,7 +23,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     phase:
         - 'build':
@@ -141,7 +141,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{installer}-.*deploy-.*'
+                - '{installer}-daily-.*'
+                - 'daisy4nfv-(merge|verify)-.*'
             block-level: 'NODE'
 
     scm:
@@ -182,21 +183,21 @@
     name: 'daisy-build-daily-macro'
     builders:
         - shell:
-            !include-raw-escape: ./daisy4nfv-basic.sh
+            !include-raw: ./daisy4nfv-basic.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-build.sh
+            !include-raw: ./daisy4nfv-build.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-upload-artifact.sh
+            !include-raw: ./daisy4nfv-upload-artifact.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-workspace-cleanup.sh
+            !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
 - builder:
     name: 'daisy-deploy-daily-macro'
     builders:
         - shell:
-            !include-raw-escape: ./daisy4nfv-download-artifact.sh
+            !include-raw: ./daisy4nfv-download-artifact.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-deploy.sh
+            !include-raw: ./daisy-deploy.sh
 
 - builder:
     name: 'daisy-test-daily-macro'