Merge "armband: Enable docker build/push for yardstick"

[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 48620fd..f7a6c13 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -154,6 +154,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - '{alias}-merge-{phase}-.*'
+                - '{installer}-daily-.*'
             block-level: 'NODE'
 
     scm:
@@ -169,6 +170,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - '{installer}-defaults'
         - '{slave-label}-defaults'
         - '{alias}-merge-defaults':
             gs-pathname: '{gs-pathname}'