From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 3 Nov 2017 18:13:07 +0000 (-0400)
Subject: Move jjb-version to templates
X-Git-Tag: v0.12.0~4^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=6624c7fc84e525bee9f58ce164ef745a257d56dc;hp=f1d2d262e4e1b095c2d2c577c042404f1f3d4e1c;p=releng%2Fglobal-jjb.git

Move jjb-version to templates

It appears that `job-group` definitions take priority over `project`
definitions. Move it to the template so that we can override the
parameter correctly.

Change-Id: I2b824e3cc89667698db8ebfdd3ce43f551e961d7
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 063b4b7e..6f1784c1 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -2,8 +2,6 @@
 - job-group:
     name: '{project-name}-ci-jobs'
 
-    jjb-version: 1.6.2
-
     jobs:
       - gerrit-jjb-deploy-job
       - gerrit-jjb-merge
@@ -12,8 +10,6 @@
 - job-group:
     name: '{project-name}-github-ci-jobs'
 
-    jjb-version: 1.6.2
-
     jobs:
       - github-jjb-deploy-job
       - github-jjb-merge
@@ -140,6 +136,7 @@
 
     branch: master
     build-timeout: 10
+    jjb-version: 1.6.2
     stream: master
     submodule-recursive: true