From f99e02785ef52d7f3424220d6ced71478c136b37 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Wed, 1 Feb 2017 15:46:25 -0800 Subject: [PATCH 1/2] Switch to trigger builds on push notifications from GitHub instead of polling SCM every minute. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 7 ++++--- .jenkins/job_beam_Release_NightlySnapshot.groovy | 4 ++-- .jenkins/job_seed.groovy | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 3165220b0693..7d56d8b1ad9c 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -158,14 +158,15 @@ class common_job_properties { // Sets common config for PostCommit jobs. static def setPostCommit(def context, def build_schedule = '0 */6 * * *', - def scm_schedule = '* * * * *', + def poll_github = true, def notify_address = 'commits@beam.apache.org') { // Set build triggers context.triggers { // By default runs every 6 hours. cron(build_schedule) - // Also polls SCM every minute. - scm(scm_schedule) + if (poll_github) { + githubPush() + } } context.publishers { diff --git a/.jenkins/job_beam_Release_NightlySnapshot.groovy b/.jenkins/job_beam_Release_NightlySnapshot.groovy index 533b444c0bc8..5be640420a88 100644 --- a/.jenkins/job_beam_Release_NightlySnapshot.groovy +++ b/.jenkins/job_beam_Release_NightlySnapshot.groovy @@ -34,11 +34,11 @@ mavenJob('beam_Release_NightlySnapshot') { common_job_properties.setMavenConfig(delegate) // Set that this is a PostCommit job. - // Polls SCM on Feb 31st, i.e. never. + // Does not poll SCM. common_job_properties.setPostCommit( delegate, '0 7 * * *', - '0 5 31 2 *', + false, 'dev@beam.apache.org') // Maven goals for this job. diff --git a/.jenkins/job_seed.groovy b/.jenkins/job_seed.groovy index 96277d109bd7..b919304ddad0 100644 --- a/.jenkins/job_seed.groovy +++ b/.jenkins/job_seed.groovy @@ -28,11 +28,11 @@ job('beam_SeedJob_Main') { common_job_properties.setTopLevelJobProperties(delegate) // Set that this is a PostCommit job. - // Polls SCM on Feb 31st, i.e. never. + // Does not poll SCM. common_job_properties.setPostCommit( delegate, '0 6 * * *', - '0 5 31 2 *', + false, 'dev@beam.apache.org') steps { From 1110502f4367232dad746fdb2488e88bbeff3158 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Wed, 1 Feb 2017 17:03:20 -0800 Subject: [PATCH 2/2] Address PR comments. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 4 ++-- .jenkins/job_beam_Release_NightlySnapshot.groovy | 3 +-- .jenkins/job_seed.groovy | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 7d56d8b1ad9c..f1f2b7f590d1 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -158,13 +158,13 @@ class common_job_properties { // Sets common config for PostCommit jobs. static def setPostCommit(def context, def build_schedule = '0 */6 * * *', - def poll_github = true, + def trigger_every_push = true, def notify_address = 'commits@beam.apache.org') { // Set build triggers context.triggers { // By default runs every 6 hours. cron(build_schedule) - if (poll_github) { + if (trigger_every_push) { githubPush() } } diff --git a/.jenkins/job_beam_Release_NightlySnapshot.groovy b/.jenkins/job_beam_Release_NightlySnapshot.groovy index 5be640420a88..a19f8ff0ced8 100644 --- a/.jenkins/job_beam_Release_NightlySnapshot.groovy +++ b/.jenkins/job_beam_Release_NightlySnapshot.groovy @@ -33,8 +33,7 @@ mavenJob('beam_Release_NightlySnapshot') { // Set maven paramaters. common_job_properties.setMavenConfig(delegate) - // Set that this is a PostCommit job. - // Does not poll SCM. + // This is a post-commit job that runs once per day, not for every push. common_job_properties.setPostCommit( delegate, '0 7 * * *', diff --git a/.jenkins/job_seed.groovy b/.jenkins/job_seed.groovy index b919304ddad0..fcdd564d9749 100644 --- a/.jenkins/job_seed.groovy +++ b/.jenkins/job_seed.groovy @@ -27,8 +27,7 @@ job('beam_SeedJob_Main') { // Set common parameters. common_job_properties.setTopLevelJobProperties(delegate) - // Set that this is a PostCommit job. - // Does not poll SCM. + // This is a post-commit job that runs once per day, not for every push. common_job_properties.setPostCommit( delegate, '0 6 * * *',