From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Fri, 29 Jul 2016 09:00:48 +0000 (+0900)
Subject: fix builder-merge
X-Git-Tag: colorado.1.0~207
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=52196d9dc4c991e410a0039412b7a467a60856c8;p=releng.git

fix builder-merge

Current builder-merge job does not update all jenkins job definitions,
since '-r' option is missing while executing 'jenkins-jobs update'.

https://build.opnfv.org/ci/job/builder-merge/1469/console

Change-Id: Ifc0de0edb6383a0f525ec94f4222f0f48f2b3ce8
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---

diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index f346c1c5f..ac323a3c1 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -99,7 +99,7 @@
                 source /opt/virtualenv/jenkins-job-builder/bin/activate
                 cd /opt/jenkins-ci/releng
                 git pull
-                jenkins-jobs update --delete-old jjb/
+                jenkins-jobs update -r --delete-old jjb/
 
 - job-template:
     name: 'builder-sandbox'