summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-03-02 17:05:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-02 17:05:35 +0000
commite0e8397f4fa90f168ec8a3a4a91980e033fea8f7 (patch)
tree7697aa9b94a67ac4b11c73754a927f1cfd3cd6f5
parentf2ee1d5e8d258da2c2ffdf8bf33f0a8f9fd8dcb0 (diff)
parent907b2f790407ee7bfbb20169b914dfa298c2511b (diff)
Merge "Made new doc job voting"
-rw-r--r--jjb/global/releng-macros.yml11
-rw-r--r--jjb/opnfvdocs/docs-rtd.yaml5
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml5
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml1
4 files changed, 17 insertions, 5 deletions
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 34f53fb5f..63613f88d 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -111,10 +111,10 @@
- compare-type: 'ANT'
pattern: '{files}'
skip-vote:
- successful: true
- failed: true
- unstable: true
- notbuilt: true
+ successful: false
+ failed: false
+ unstable: false
+ notbuilt: false
- trigger:
name: gerrit-trigger-change-merged
@@ -131,6 +131,9 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: 'ANT'
+ pattern: '{files}'
- trigger:
name: 'experimental'
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 2d5ec4fa4..c78e7f0f6 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -33,7 +33,10 @@
- git-scm
triggers:
- - gerrit-trigger-change-merged
+ - gerrit-trigger-change-merged:
+ project: '**'
+ branch: '{branch}'
+ files: 'docs/**/*.*'
builders:
- shell: !include-raw: docs-post-rtd.sh
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 12950338d..661f060ee 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -62,6 +62,11 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ skip-vote:
+ successful: true
+ failed: true
+ unstable: true
+ notbuilt: true
builders:
- check-bash-syntax
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 98f7ab90a..10ee72a8b 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -139,3 +139,4 @@
- gerrit-trigger-change-merged:
project: '{project}'
branch: '{branch}'
+ files: '**'