Merge changes from topics 'update_postbuildscript_invocation', 'upgrade_jjb_version', 'upgrade_global_jjb'

* changes:
  Update format of postbuildscript call
  Update jjb version to 2.0.3
  Upgrade global-jjb to 0.17.0

3 files changed, 21 insertions, 23 deletions

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 6f2a3db8e..a7eb833e0 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -11,7 +11,7 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
-    jjb-version: 2.0.0
+    jjb-version: 2.0.3
 
 - job-template:
     name: '{project}-verify-jjb'
diff --git a/jjb/global-jjb b/jjb/global-jjb
-Subproject 90e4e825b3d0ac5959122c50e457419ad0cfe13
+Subproject edf56a1e9ce91d936388621ecfc850162aabfeb
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 27167b67e..49446efbd 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -249,34 +249,32 @@
 
 - publisher:
     name: infra-shiplogs
-    # To archive things, the job will need to create an "archives" directory in
-    # the workspace and this macro will handle copying the contents of the
-    # archives directory.
+    # lf-infra macro to finish up a build.
     #
-    # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files to
-    # archive. You can pass globstar patterns for example "**/*.xml **/*.log" as
-    # the archive pattern. This is a space separated list of files to archive.
-    #
-    # Also ensure that the workspace is cleaned up at the end of the build.
+    # Handles the following:
+    #   - Shipping logs to Nexus logs site repository
+    #   - Cleanup workspace
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw-escape: include-raw-deploy-archives.sh
-            - maven-target:
-                maven-version: '{maven-version}'
-                pom: '.archives/deploy-archives.xml'
-                goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
-                settings: 'jenkins-log-archives-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - description-setter:
-                regexp: '^Build logs: .*'
-          script-only-if-succeeded: false
-          script-only-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:
-          fail-build: false`
+          exclude:
+            # Do not clean up *.jenkins-trigger files for jobs that use a
+            # properties file as input for triggering another build.
+            - '**/*.jenkins-trigger'
+          fail-build: false
+
 
 # SCMS
 - scm: