From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 19 Mar 2018 17:37:46 +0000 (+0000)
Subject: Merge "Support PostBuildScript 2.x"
X-Git-Tag: v0.18.0~20
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=7eb6004ea840df565c6df3620a71668a58f3df0a;hp=aa205517366205dd017d0801bd0cfe104e742c1a;p=releng%2Fglobal-jjb.git

Merge "Support PostBuildScript 2.x"
---

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index fb179926..133becdc 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -382,11 +382,17 @@
     publishers:
       - postbuildscript:
           builders:
-            - lf-infra-sysstat
-            - lf-infra-ship-logs
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: false
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - lf-infra-sysstat
+                - lf-infra-ship-logs
+          mark-unstable-if-failed: true
       - workspace-cleanup:
           exclude:
             # Do not clean up *.jenkins-trigger files for jobs that use a
diff --git a/tox.ini b/tox.ini
index ede16ca2..69381d08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ commands =
 
 [testenv:jjb]
 deps =
-    jenkins-job-builder==2.0.2
+    jenkins-job-builder>=2.0.3
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test