From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 3 Nov 2015 22:55:09 +0000 (-0700)
Subject: jenkins-job-builder: postbuildscript publisher fixes
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b7efab1a45dda63fdd72de41d5929b3b4e4ac7d;p=ceph-build.git

jenkins-job-builder: postbuildscript publisher fixes

Prior to this commit, the JJB YAML syntax was just broken, and
jenkins-job-builder would not parse this file.

Fix the YAML syntax, make the script run properly as a "shell" step,
make it execute regardless of the build status (with the
"script-only-if-*" settings).
---

diff --git a/jenkins-job-builder/config/definitions/jjb.yml b/jenkins-job-builder/config/definitions/jjb.yml
index c6e3add1..6bdc27ac 100644
--- a/jenkins-job-builder/config/definitions/jjb.yml
+++ b/jenkins-job-builder/config/definitions/jjb.yml
@@ -34,6 +34,9 @@
     builders:
       - shell: "bash jenkins-job-builder/build/build"
 
-    - postbuildscript:
-        generic-script:
-            - 'rm $HOME/.jenkins_jobs.ini'
+    publishers:
+      - postbuildscript:
+          builders:
+            - shell: 'rm $HOME/.jenkins_jobs.ini'
+        script-only-if-succeeded: false
+        script-only-if-failed: false