From 3dd3dfd25970e371bfc305624d5429638a7b66c5 Mon Sep 17 00:00:00 2001
From: ShubhamRathi <shubhamiiitbackup@gmail.com>
Date: Thu, 16 Feb 2017 00:25:14 +0530
Subject: Fix bugs for new doc jobs

Added new macro and changed parameters
in docs-rtd.yml

Change-Id: Ibb3306853e241674099ae0227719af6dc1280d1f
Signed-off-by: ShubhamRathi <shubhamiiitbackup@gmail.com>
---
 jjb/global/releng-macros.yml | 23 +++++++++++++++++++++--
 jjb/opnfvdocs/docs-rtd.yaml  | 10 +++-------
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'jjb')

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 19002fe8c..298fb0494 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -61,7 +61,19 @@
             choosing-strategy: 'gerrit'
             refspec: '$GERRIT_REFSPEC'
             <<: *git-scm-defaults
-
+- scm:
+    name: git-scm-with-submodules
+    scm:
+        - git:
+            credentials-id: '$SSH_CREDENTIAL_ID'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'refs/heads/{branch}'
+            skip-tag: true
+            wipe-workspace: true
+            submodule:
+                recursive: true
 - trigger:
     name: 'daily-trigger-disabled'
     triggers:
@@ -72,7 +84,6 @@
     triggers:
         - timed: ''
 
-# NOTE: unused macro, but we may use this for some jobs.
 - trigger:
     name: gerrit-trigger-patchset-created
     triggers:
@@ -92,6 +103,14 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: 'ANT'
+                    pattern: '{files}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
 - trigger:
     name: gerrit-trigger-change-merged
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 40e91ca26..25bb9837a 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -55,10 +55,11 @@
             branch: '{branch}'
         - string:
             name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/releng
+            default: https://gerrit.opnfv.org/gerrit/opnfvdocs
             description: 'Git URL to use on this Jenkins Slave'
     scm:
-        - git-scm-gerrit
+        - git-scm-with-submodules:
+            branch: '{branch}'
 
     triggers:
         - gerrit-trigger-patchset-created:
@@ -66,11 +67,6 @@
             project: '**'
             branch: '{branch}'
             files: 'docs/**/*.rst'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
         - timed: 'H H * * *'
 
     builders:
-- 
cgit 1.2.3-korg