From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 30 Jan 2017 21:31:33 +0000 (-0800)
Subject: Fix jjb merge configuration
X-Git-Tag: 1.0.0-Amsterdam~796
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8102a40da643b5f14e899d353a5eef5d6a537f5b;p=ci-management.git

Fix jjb merge configuration

In previous projects we used to run the JJB verify and merge jobs on the
master (as the only allowed job type to run there). As we're trying to
avoid this in general we need to make sure that it works properly on a
dynamic minion

Change-Id: I48da50c8d9eb403a6366eca897b1433798ec97a1
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index d48fd490b..1d230621e 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -106,6 +106,10 @@
           files: 'jjb/**'
 
     builders:
+      - config-file-provider:
+          files:
+            - file-id: 'jjbini'
+              variable: 'JJBINI'
       - shell: |
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate