diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-01-30 13:31:33 -0800 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-01-30 13:31:33 -0800 |
| commit | 8102a40da643b5f14e899d353a5eef5d6a537f5b (patch) | |
| tree | 23b0bf5b6077d521b87c54434beb12da264398da /jjb | |
| parent | ebc710af742601214491c5b2b9a4f6847d235d6c (diff) | |
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>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
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 |