summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha (zxiiro) <thanh.ha@linuxfoundation.org>2018-10-25 20:50:51 +0000
committerGerrit Code Review <gerrit@fd.io>2018-10-25 20:50:51 +0000
commit8601686e5afcb8ceec5fc5621f71e059fa864169 (patch)
tree5ca2ed688ab535297c68bb899e98789aa2da80eb
parent3fc643de7ed58b0742c3743e7e1859d7f98e2618 (diff)
parent7b4faf2a2ae8294e1f17f10dd345bb798095ec4d (diff)
Merge "Fix publisher macro causing JJB 2.5.0 errors"
-rw-r--r--jjb/global-macros.yaml23
1 files changed, 10 insertions, 13 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 92c881fb9..ab7bf5b54 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -452,19 +452,16 @@
publishers:
- postbuildscript:
builders:
- - shell: !include-raw: 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