From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Mon, 29 Oct 2018 19:39:35 +0000 (-0500)
Subject: Fix github-maven-merge scm config
X-Git-Tag: v0.25.4^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fv0.25.x;p=releng%2Fglobal-jjb.git

Fix github-maven-merge scm config

Specifying a refspec on this scm config causes no merge job to be
triggered on a push action.

Change-Id: I6037e694c73fdfa2c6177eda4e83a6ad0895c3ae
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index eec2bdbc..8dbf29c4 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -610,8 +610,8 @@
     scm:
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
diff --git a/releasenotes/notes/fix_scm_merge-b5043a151549efd9.yaml b/releasenotes/notes/fix_scm_merge-b5043a151549efd9.yaml
new file mode 100644
index 00000000..4b803757
--- /dev/null
+++ b/releasenotes/notes/fix_scm_merge-b5043a151549efd9.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Specify refspec to be blank for SCM config on github-maven-merge job.  Setting the
+    refspec to `+refs/pull/*:refs/remotes/origin/pr/*` causes there to be no merge job triggered.