From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 5 Apr 2016 20:22:00 +0000 (-0700)
Subject: jenkins-job-builder: diagnostics and allow to run on master
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F349%2Fhead;p=ceph-build.git

jenkins-job-builder: diagnostics and allow to run on master

Adding --log-level DEBUG to hope to point out problems, and allow
job to run on master so it runs without mita provisioning (it's small
and should be fast)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/jenkins-job-builder/build/build b/jenkins-job-builder/build/build
index 48f61842..d103a2f4 100644
--- a/jenkins-job-builder/build/build
+++ b/jenkins-job-builder/build/build
@@ -46,11 +46,11 @@ for dir in `find . -maxdepth 1 -path ./.git -prune -o -type d -print`; do
         echo "found definitions directory: $definitions_dir"
 
         # Test the definitions first
-        venv/bin/jenkins-jobs --conf $JJB_CONFIG test $definitions_dir -o /tmp/output
+        venv/bin/jenkins-jobs --log-level DEBUG --conf $JJB_CONFIG test $definitions_dir -o /tmp/output
 
         # Update Jenkins with the output if they passed the test phase
         # Note that this needs proper permissions with the right credentials to the
         # correct Jenkins instance.
-        venv/bin/jenkins-jobs --conf $JJB_CONFIG update $definitions_dir
+        venv/bin/jenkins-jobs --log-level DEBUG --conf $JJB_CONFIG update $definitions_dir
     fi
 done
diff --git a/jenkins-job-builder/config/definitions/jjb.yml b/jenkins-job-builder/config/definitions/jjb.yml
index 2fff7d8e..124fdd73 100644
--- a/jenkins-job-builder/config/definitions/jjb.yml
+++ b/jenkins-job-builder/config/definitions/jjb.yml
@@ -1,6 +1,6 @@
 - job:
     name: jenkins-job-builder
-    node: small && trusty
+    node: (small && trusty) || master
     project-type: freestyle
     defaults: global
     display-name: 'Jenkins Job Builder'