diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-12-14 11:52:22 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-04 04:56:59 +0000 |
| commit | fc7808c24a3fec17d47394e02791099d02c7b459 (patch) | |
| tree | ae1993962ea81751eeb87ee0a189001ab07f1ff3 | |
| parent | d16036fdd1a6335af617c1520c989fc43db6278c (diff) | |
cleanup releng-macros
- sort in execution order
- remove unused macro ('weekly-trigger-disabled')
Change-Id: If72f2554985e8e632ad731c3dc17a23fbc8cd630
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
| -rw-r--r-- | jjb/global/releng-macros.yml | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 7647a35d3..ce307e691 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -1,4 +1,15 @@ -# OLD Releng macros +# Releng macros +# +# NOTE: make sure macros are listed in execution ordered. +# +# 1. parameters/properties +# 2. scm +# 3. triggers +# 4. wrappers +# 5. prebuilders (maven only, configured like Builders) +# 6. builders (maven, freestyle, matrix, etc..) +# 7. postbuilders (maven only, configured like Builders) +# 8. publishers/reporters/notifications - parameter: name: project-parameter @@ -24,13 +35,6 @@ default: '{branch}' description: "JJB configured GERRIT_BRANCH parameter" -- wrapper: - name: ssh-agent-wrapper - wrappers: - - ssh-agent-credentials: - users: - - 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' - - scm: name: git-scm scm: @@ -54,11 +58,7 @@ triggers: - timed: '' -- trigger: - name: 'weekly-trigger-disabled' - triggers: - - timed: '' - +# NOTE: unused macro, but we may use this for some jobs. - trigger: name: gerrit-trigger-patch-submitted triggers: @@ -79,6 +79,7 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' +# NOTE: unused macro, but we may use this for some jobs. - trigger: name: gerrit-trigger-patch-merged triggers: @@ -95,16 +96,12 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' -- publisher: - name: archive-artifacts - publishers: - - archive: - artifacts: '{artifacts}' - allow-empty: true - fingerprint: true - latest-only: true - -# New Releng macros +- wrapper: + name: ssh-agent-wrapper + wrappers: + - ssh-agent-credentials: + users: + - 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' - builder: name: build-html-and-pdf-docs-output @@ -388,3 +385,11 @@ sed -r -i '4,$s/^/ /g' lint.log fi +- publisher: + name: archive-artifacts + publishers: + - archive: + artifacts: '{artifacts}' + allow-empty: true + fingerprint: true + latest-only: true |