From: Aric Gardner <agardner@linuxfoundation.org>
Date: Fri, 27 Jan 2017 16:47:55 +0000 (-0500)
Subject: Change choosing strategy for docs merge to git-scm
X-Git-Tag: danube.1.0~404^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=26e735a55134a17d3c7cd26d8100a790a484a171;p=releng.git

Change choosing strategy for docs merge to git-scm

merge jobs should be using git-scm rather than
git-scm-gerrit.

git-scm-gerrit will clone the exact patchset
git-scm will clone repo/branch

Change-Id: Ic11b093feff0b1ab58383b74c85fde92c2e6c0a3
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
---

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 0d4c46199..cf7bae5b3 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -87,7 +87,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     triggers:
         - gerrit: