From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Wed, 24 May 2017 12:58:06 +0000 (-0500)
Subject: Add trigger for github plugin
X-Git-Tag: v0.2.1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=8906c7a1405c0c0dc9fca5a8fb0ef0e5aab39f53;p=releng%2Fglobal-jjb.git

Add trigger for github plugin

JIRA: RELENG-127
Change-Id: I5e10d5e5d3a530fedfdd0d762b1f212a9acfbe09
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index b1d3646b..5651f51b 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -201,7 +201,7 @@
 
     scm:
       - lf-infra-github-scm:
-          url: '$GIT_URL/$PROJECT'
+          url: '{github-url}/{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
@@ -209,6 +209,9 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - github
+      - pollscm:
+          cron: ''
       - github-pull-request:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
@@ -242,7 +245,7 @@
 
     scm:
       - lf-infra-github-scm:
-          url: '$GIT_URL/$PROJECT'
+          url: '{github-url}/{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 175af865..e9b1b643 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -130,7 +130,7 @@
     scm:
       - git:
           credentials-id: '{jenkins-ssh-credential}'
-          url: '$GIT_URL/$PROJECT'
+          url: '{url}'
           refspec: '{refspec}'
           skip-tag: true
           wipe-workspace: true