summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global/releng-macros.yml23
-rw-r--r--jjb/opnfvdocs/docs-rtd.yaml10
2 files changed, 24 insertions, 9 deletions
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: