From f76c82abd9ad7f86b1fdcc0b77a78edf2e87c2c5 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Sun, 11 Mar 2018 21:48:09 -0400
Subject: [PATCH] Support PostBuildScript 2.x

This is a breaking change that requires consumers of global-jjb
to switch to JJB 2.0.3 and install PostBuildScript 2.x in Jenkins.

It updates lf-infra-publish macro to switch to the PostBuildScript 2.x
YAML definitions.

Issue: RELENG-832
Change-Id: I04020587acfb8b6550c0221ebfb97a501f46b15a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/lf-macros.yaml | 16 +++++++++++-----
 tox.ini            |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

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
 
-- 
2.16.6