summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2015-09-10 14:48:32 -0400
committerAric Gardner <agardner@linuxfoundation.org>2015-09-10 14:49:25 -0400
commit27e3aaf5262f35809d93e06edeb89d55db81d49b (patch)
tree6001067b6e21fad14817ed5d0ec0ae5d46f0ee9d /jjb
parent0097178fc74f1a016d9ee76f0692d70eea12a5b1 (diff)
Expand regex to non-arno project
Also added merge job, but only matching releng Change-Id: Id3cfb9876cc37c4458c856a9fd6c7ad26119ee6a Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/opnfv/opnfv-docs.yml55
1 files changed, 53 insertions, 2 deletions
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 1faf5535b..b89ca0899 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -1,5 +1,5 @@
########################
-# Job configuration for dovetail-docs
+# Job configuration for opnfv-docs
########################
- project:
@@ -9,6 +9,7 @@
jobs:
- 'opnfv-docs-verify'
+ - 'opnfv-docs-merge'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
@@ -63,7 +64,57 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'copper|releng'
+#Left out arno projects oscar|octopus|functest|genesis|pharos|opnfvdocs|vswitchperf|yardstick
+ project-pattern: 'apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sfc|vnf_forwarding_graph'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/master'
+ file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
+
+ builders:
+ - shell:
+ !include-raw ../../utils/docu-build-new.sh
+
+- job-template:
+ name: 'opnfv-docs-merge'
+
+ node: master
+
+ project-type: freestyle
+
+ logrotate:
+ daysToKeep: 30
+ numToKeep: 10
+ artifactDaysToKeep: -1
+ artifactNumToKeep: -1
+
+ parameters:
+ - project-parameter:
+ project: $GERRIT_PROJECT
+ - gerrit-parameter:
+ branch: 'master'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - ssh-agent-credentials:
+ user: '{ssh-credentials}'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'REG_EXP'
+ project-pattern: 'releng'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/master'