From 85ebbbe10b57d837946793bd9367c2fbde59216a Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Tue, 3 Apr 2018 10:42:45 -0500 Subject: Upgrade global-jjb to 0.17.0 Issue-ID: CIMAN-153 Change-Id: Ic6ee9a06111c0ff51dd1da3f2e74953a1b0278cb Signed-off-by: Jeremy Phelps --- jjb/global-jjb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/global-jjb b/jjb/global-jjb index 90e4e825b..edf56a1e9 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit 90e4e825b3d0ac5959122c50e457419ad0cfe137 +Subproject commit edf56a1e9ce91d936388621ecfc850162aabfebd -- cgit 1.2.3-korg From d828822f47d2e1212f76d17cfd56dffb187cf35e Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Tue, 3 Apr 2018 10:57:12 -0500 Subject: Update jjb version to 2.0.3 Change-Id: Ie7fd122500560d693ac2f5f175e8ca605769a97b Issue-ID: CIMAN-153 Signed-off-by: Jeremy Phelps --- jjb/ci-management/ci-management.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' -- cgit 1.2.3-korg From cf6116dbee547ad516c4e04bfdcc3a215e8d3cfe Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Tue, 3 Apr 2018 11:15:00 -0500 Subject: Update format of postbuildscript call Change-Id: Ice34595c329330a038c267d9577d8054bf8c5e0a Issue-ID: CIMAN-153 Signed-off-by: Jeremy Phelps --- jjb/global-macros.yaml | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) 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: -- cgit 1.2.3-korg