summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/daisy4nfv/daisy4nfv-merge-jobs.yml')
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 11531f4a4..9e7b867af 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -21,7 +21,7 @@
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled: false
+ disabled: true
#####################################
# patch merge phases
#####################################
@@ -29,7 +29,7 @@
- 'build':
slave-label: 'opnfv-build-centos'
- 'deploy-virtual':
- slave-label: 'opnfv-build-centos'
+ slave-label: 'daisy-virtual'
#####################################
# jobs
#####################################
@@ -148,7 +148,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-deploy-.*'
+ - '{alias}-merge-(master|danube)'
block-level: 'NODE'
scm: