summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2017-01-05 04:54:54 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-05 04:54:54 +0000
commitc12d2acd95269363db527bae50b16cd77fb00351 (patch)
tree573f7a6ba5f4950c1f4fe0f01db2b54abd22ccf3
parent10a7c1ea663ce09f0bcda151c82bfca068f8b588 (diff)
parentfc7808c24a3fec17d47394e02791099d02c7b459 (diff)
Merge "cleanup releng-macros"
-rw-r--r--jjb/global/releng-macros.yml51
1 files changed, 28 insertions, 23 deletions
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 5b7ef5065..10835f6a3 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
@@ -389,3 +386,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