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 d84e46f..1e7bf90 100644 (file)
--- 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 31e0c00..103a696 100644 (file)
--- 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 f6092ee..6224ca9 100644 (file)
--- 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: