Set choosing strategy to default 13/8513/2
authorJeremy Phelps <jphelps@linuxfoundation.org>
Wed, 23 Aug 2017 22:10:18 +0000 (17:10 -0500)
committerJeremy Phelps <jphelps@linuxfoundation.org>
Wed, 23 Aug 2017 22:17:34 +0000 (17:17 -0500)
The doc project aggregates other projects
docs and builds them. This needs the default
choosing strategy.

Change-Id: I99ebdfc553cf86b58aaf909e9c0923c26aa3660c
Issue-ID: DOC-11
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
jjb/doc/doc-templates-rtd.yaml

index 947ff73..c6bec58 100644 (file)
@@ -35,9 +35,9 @@
           credentials-id: '{jenkins-ssh-credential}'
           url: '$GIT_BASE'
           refspec: ''
-          choosing-strategy: 'gerrit'
+          choosing-strategy: 'default'
           branches:
-            - 'origin/$GERRIT_BRANCH'
+            - 'refs/heads/{branch}'
           skip-tag: true
           wipe-workspace: true
           submodule:
           credentials-id: '{jenkins-ssh-credential}'
           url: '$GIT_BASE'
           refspec: ''
-          choosing-strategy: 'gerrit'
+          choosing-strategy: 'default'
           branches:
             - 'refs/heads/{branch}'
           skip-tag: true