From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 3 May 2018 20:45:00 +0000 (-0400)
Subject: Fix jenkins-cfg GitHub cfg to build head of branch
X-Git-Tag: v0.19.0~3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F10416%2F1;p=releng%2Fglobal-jjb.git

Fix jenkins-cfg GitHub cfg to build head of branch

There this job was originally misconfigured and was configured as if
it was a verify job. It should be operating instead as a merge job
and not be pulling in the $sha1 setting. This fixes the job to only
build HEAD of branch as one would expect.

Issue: RELENG-844
Change-Id: I8fa6b25a2fd4b598f619ab4c6ae80ce411756cb4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index d2a8f5ea..988f8931 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -367,8 +367,8 @@
     scm:
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
           submodule-recursive: true
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'