From 907b2f790407ee7bfbb20169b914dfa298c2511b Mon Sep 17 00:00:00 2001
From: ShubhamRathi <shubhamiiitbackup@gmail.com>
Date: Wed, 1 Mar 2017 19:49:06 +0530
Subject: Made new doc job voting

1. New has been made voting.
   Old doc job has been made non voting.
2. Adding files variable which triggers
   job on changes in 'docs/'
   Merge job earlier did not trigger on merge.

Change-Id: Id19c02949a0a5f2b1da0682f18ed6051403aa77e
Signed-off-by: ShubhamRathi <shubhamiiitbackup@gmail.com>
---
 jjb/global/releng-macros.yml    | 11 +++++++----
 jjb/opnfvdocs/docs-rtd.yaml     |  5 ++++-
 jjb/opnfvdocs/opnfvdocs.yml     |  5 +++++
 jjb/qtip/qtip-validate-jobs.yml |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'jjb')

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: '**'
-- 
cgit 1.2.3-korg