X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy4nfv-merge-jobs.yaml;h=c261c23bc58d97ede632d43c9e9d1ce72a8aef9f;hb=e135c73d59d65804cdbaef3f7165f9400dfe454c;hp=3a0a59fc406c18e66aca7e6172d2d1a1a7e43c00;hpb=9c2f3e7d4a21c7365e70d1dfdfe6d682adb94f12;p=releng.git diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml index 3a0a59fc4..c261c23bc 100644 --- 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