From bfaf7c508945a86d0250952ae5afda969ea7f6b8 Mon Sep 17 00:00:00 2001 From: Jeremy Phelps Date: Wed, 24 May 2017 07:58:06 -0500 Subject: [PATCH] Add trigger for github plugin JIRA: RELENG-127 Change-Id: I5e10d5e5d3a530fedfdd0d762b1f212a9acfbe09 Signed-off-by: Jeremy Phelps --- jjb/lf-ci-jobs.yaml | 7 +++++-- jjb/lf-macros.yaml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) 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 -- 2.16.6