From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Tue, 16 Oct 2018 18:24:24 +0000 (-0700)
Subject: Set JJB version in Releng CI Jobs
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0b400b6d96ca82fd7a17c704fcf8a56337a5adfe;p=releng.git

Set JJB version in Releng CI Jobs

Moves the jjb-version configuration from globals to releng CI jobs. This
was not being pulled into the '{project-name}-ci-jobs' configuration and
kept our JJB version at 2.2.1.

Change-Id: I33a62e639bbca6d519957515af591615543d27b7
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml
index d66c007ea..e584107c8 100644
--- a/jjb/global/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yaml
@@ -16,7 +16,6 @@
     build-node: 'opnfv-build'
     gerrit-server-name: 'gerrit.opnfv.org'
     jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
-    jjb-version: '2.5.0'
     lftools-version: '<1.0.0'
 
     properties:
diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-ci-jobs.yaml
index 17fb6e42c..f7c960335 100644
--- a/jjb/releng/releng-ci-jobs.yaml
+++ b/jjb/releng/releng-ci-jobs.yaml
@@ -3,6 +3,7 @@
     name: releng-builder-jobs
     project: 'releng'
     project-name: 'releng'
+    jjb-version: '2.5.0'
 
     build-timeout: 60