From: Aric Gardner <agardner@linuxfoundation.org>
Date: Mon, 30 Jan 2017 21:34:06 +0000 (-0500)
Subject: Found three merge jobs still using git-scm-gerrit
X-Git-Tag: danube.1.0~394
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eec5787175e731d174cfec56bf995ef4bdcd99d9;p=releng.git

Found three merge jobs still using git-scm-gerrit

merge jobs should not be cloning the patchset, they should be cloning
master after the merge is complete.

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

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index d84e46f3e..1e7bf9080 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -50,7 +50,7 @@
             option: 'project'
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     wrappers:
         - ssh-agent-wrapper
@@ -180,7 +180,7 @@
             block-level: 'NODE'
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     wrappers:
         - ssh-agent-wrapper
diff --git a/jjb/escalator/escalator.yml b/jjb/escalator/escalator.yml
index 31e0c0004..103a6962f 100644
--- a/jjb/escalator/escalator.yml
+++ b/jjb/escalator/escalator.yml
@@ -241,7 +241,7 @@
     concurrent: true
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     wrappers:
         - ssh-agent-wrapper
diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml
index f6092eee0..6224ca989 100644
--- a/jjb/releng/opnfv-docs.yml
+++ b/jjb/releng/opnfv-docs.yml
@@ -89,7 +89,7 @@
             description: "JJB configured GERRIT_REFSPEC parameter"
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     triggers:
         - gerrit: