summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-08-02 22:37:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-02 22:37:34 +0000
commitc0e7b09b0a23ba6cc311f9684a94813a76e96a14 (patch)
treec338b6f25c4406e131da5cad94aebedad4fa8305 /jjb
parenta50d18ac8345dc3607f2639e7753dbba8465edbb (diff)
parent09557ce607f6cc685476aeb6fe54e140217e54a2 (diff)
Merge "auto: verify and merge jobs"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/auto/auto.yaml125
1 files changed, 103 insertions, 22 deletions
diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index ee7208205..62f6ec29d 100644
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -7,16 +7,15 @@
# -------------------------------
# BRANCH ANCHORS
# -------------------------------
- master: &master
- stream: master
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- fraser: &fraser
- stream: fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
+ stream:
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
# -------------------------------
# DEPLOY TYPE ANCHORS
# -------------------------------
@@ -28,20 +27,9 @@
# -------------------------------
# CI POD's
# -------------------------------
- # fraser
- # -------------------------------
pod:
- # yamllint disable rule:key-duplicates
- - auto-baremetal:
- <<: *baremetal
- <<: *fraser
- # -------------------------------
- # master
- # -------------------------------
- auto-baremetal:
<<: *baremetal
- <<: *master
- # yamllint enable rule:key-duplicates
# -------------------------------
# scenarios
# -------------------------------
@@ -53,7 +41,8 @@
jobs:
- '{installer}-{scenario}-{pod}-auto-daily-{stream}'
- '{installer}-deploy-{pod}-daily-{stream}'
- - '{project}-verify-basic'
+ - 'auto-verify-{stream}'
+ - 'auto-merge-{stream}'
########################
# job templates
@@ -107,6 +96,98 @@
same-node: true
block: true
+- job-template:
+ name: 'auto-verify-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ project-type: freestyle
+
+ concurrent: true
+
+ properties:
+ - logrotate-default
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm-gerrit
+
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
+
+ builders:
+ - shell: |
+ pwd
+ ./ci/build-auto.sh verify
+
+- job-template:
+ name: 'auto-merge-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ project-type: freestyle
+
+ concurrent: true
+
+ properties:
+ - logrotate-default
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm
+
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
+
+ builders:
+ - shell: |
+ pwd
+ ./ci/build-auto.sh merge
+
########################
# trigger macros
########################