From 6624c7fc84e525bee9f58ce164ef745a257d56dc Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 3 Nov 2017 14:13:07 -0400 Subject: [PATCH] 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 --- jjb/lf-ci-jobs.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 -- 2.16.6