Merge "Remove functest-components from gates"

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

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
index 3a0a59f..c261c23 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
@@ -18,11 +18,11 @@
       - master:
           branch: '{stream}'
           gs-pathname: ''
-          disabled: false
+          disabled: true
       - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: false
+          disabled: true
     #####################################
     # patch merge phases
     #####################################
@@ -61,7 +61,7 @@
           use-build-blocker: true
           blocking-jobs:
             - '{alias}-merge-(master|fraser)'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm
@@ -158,7 +158,7 @@
           blocking-jobs:
             - '{alias}-merge-{phase}-.*'
             - '{installer}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm