From e47c23c4de699ac071be6ae81f9e449c2d5eb12c Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Wed, 1 Feb 2017 15:32:44 -0800 Subject: [PATCH 01/10] Enable oneshots of Jenkins runs in precommit. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 11 ++++++++++- .jenkins/job_beam_PostCommit_Java_MavenInstall.groovy | 4 ++-- ...beam_PostCommit_Java_RunnableOnService_Apex.groovy | 2 +- ..._PostCommit_Java_RunnableOnService_Dataflow.groovy | 2 +- ...eam_PostCommit_Java_RunnableOnService_Flink.groovy | 2 +- ..._PostCommit_Java_RunnableOnService_Gearpump.groovy | 4 ++-- ...eam_PostCommit_Java_RunnableOnService_Spark.groovy | 2 +- .jenkins/job_beam_PostCommit_Python_Verify.groovy | 2 +- .jenkins/job_beam_Release_NightlySnapshot.groovy | 1 + .jenkins/job_seed.groovy | 1 + 10 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index eee1cdae7e25..59a22da4eea0 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -100,7 +100,8 @@ class common_job_properties { // below to insulate callers from internal parameter defaults. private static def setPullRequestBuildTrigger(def context, def commitStatusContext, - def successComment = '--none--') { + def successComment = '--none--', + def postCommitPhrase = '') { context.triggers { githubPullRequest { admins(['asfbot']) @@ -108,6 +109,10 @@ class common_job_properties { orgWhitelist(['apache']) allowMembersOfWhitelistedOrgsAsAdmin() permitAll() + if (postCommitPhrase != '') { + triggerPhrase(postcommitPhrase) + onlyTriggerPhrase() + } extensions { commitStatus { @@ -173,6 +178,7 @@ class common_job_properties { // Sets common config for PostCommit jobs. static def setPostCommit(def context, + def trigger_phrase, def build_schedule = '0 */6 * * *', def trigger_every_push = true, def notify_address = 'commits@beam.apache.org') { @@ -185,6 +191,9 @@ class common_job_properties { } } + // Enable triggering oneshots of pull requests + setPullRequestBuildTrigger(context, 'Jenkins PostCommit', '--none--', trigger_phrase) + context.publishers { // Notify an email address for each failed build (defaults to commits@). mailer(notify_address, false, true) diff --git a/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy b/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy index a288a8448211..263a58445cdb 100644 --- a/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy +++ b/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy @@ -34,8 +34,8 @@ mavenJob('beam_PostCommit_Java_MavenInstall') { // Set maven parameters. common_job_properties.setMavenConfig(delegate) - // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate) + // Sets that this is a PostCommit job, and disables oneshots in precommit. + common_job_properties.setPostCommit(delegate, '') // Maven goals for this job. goals('-B -e -P release,dataflow-runner clean install coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner" ]\'') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy index f6575963b8b9..68d6e8011b17 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy @@ -29,7 +29,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Apex') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate) + common_job_properties.setPostCommit(delegate, 'Run Apex RunableOnService') // Maven goals for this job. goals('''clean verify --projects runners/apex \ diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy index f849c835c168..73a00c20d68b 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy @@ -32,7 +32,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Dataflow') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate) + common_job_properties.setPostCommit(delegate, 'Run Dataflow RunnableOnService') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/google-cloud-dataflow-java -DforkCount=0 -DrunnableOnServicePipelineOptions=\'[ "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner", "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-runnable-on-service-tests/" ]\'') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy index c0caa51b84be..65ba48373dae 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy @@ -31,7 +31,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Flink') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate) + common_job_properties.setPostCommit(delegate, 'Run Flink RunnableOnService') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/flink/runner -Plocal-runnable-on-service-tests -Prunnable-on-service-tests') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index 1e35017308f3..8c388f3277eb 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -35,8 +35,8 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { // Sets that this is a PostCommit job. // 0 5 31 2 * will run on Feb 31 (i.e. never) according to job properties. - // This job triggers only on SCM. - common_job_properties.setPostCommit(delegate, '0 5 31 2 *') + // This job triggers only on SCM, precommit is disabled as well. + common_job_properties.setPostCommit(delegate, '', '0 5 31 2 *') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/gearpump -DforkCount=0 -DrunnableOnServicePipelineOptions=\'[ "--runner=TestGearpumpRunner", "--streaming=false" ]\'') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy index 97f6a70eaded..65eb7d820ae2 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy @@ -31,7 +31,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Spark') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate) + common_job_properties.setPostCommit(delegate, 'Run Spark RunnableOnService') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/spark -Prunnable-on-service-tests -Plocal-runnable-on-service-tests -Dspark.port.maxRetries=64 -Dspark.ui.enabled=false') diff --git a/.jenkins/job_beam_PostCommit_Python_Verify.groovy b/.jenkins/job_beam_PostCommit_Python_Verify.groovy index d92958c93079..ae00b6a56ead 100644 --- a/.jenkins/job_beam_PostCommit_Python_Verify.groovy +++ b/.jenkins/job_beam_PostCommit_Python_Verify.groovy @@ -28,7 +28,7 @@ job('beam_PostCommit_Python_Verify') { common_job_properties.setTopLevelMainJobProperties(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate, '0 3-22/6 * * *') + common_job_properties.setPostCommit(delegate, 'Run Python PostCommit', '0 3-22/6 * * *') // Execute shell command to test Python SDK. steps { diff --git a/.jenkins/job_beam_Release_NightlySnapshot.groovy b/.jenkins/job_beam_Release_NightlySnapshot.groovy index f2c3ff0740d5..94d528c9efcf 100644 --- a/.jenkins/job_beam_Release_NightlySnapshot.groovy +++ b/.jenkins/job_beam_Release_NightlySnapshot.groovy @@ -36,6 +36,7 @@ mavenJob('beam_Release_NightlySnapshot') { // This is a post-commit job that runs once per day, not for every push. common_job_properties.setPostCommit( delegate, + '', '0 7 * * *', false, 'dev@beam.apache.org') diff --git a/.jenkins/job_seed.groovy b/.jenkins/job_seed.groovy index b830f884160c..ae13b2fa1460 100644 --- a/.jenkins/job_seed.groovy +++ b/.jenkins/job_seed.groovy @@ -31,6 +31,7 @@ job('beam_SeedJob') { // This is a post-commit job that runs once per day, not for every push. common_job_properties.setPostCommit( delegate, + 'Run Seed Job', '0 6 * * *', false, 'dev@beam.apache.org') From 4cb4e864634198e4837ee17a2c280943f7bfb658 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Wed, 1 Feb 2017 15:37:58 -0800 Subject: [PATCH 02/10] set a default for trigger phrase and disable by default. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 6 ++++-- .jenkins/job_beam_PostCommit_Java_MavenInstall.groovy | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 59a22da4eea0..2adb53843193 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -178,7 +178,7 @@ class common_job_properties { // Sets common config for PostCommit jobs. static def setPostCommit(def context, - def trigger_phrase, + def trigger_phrase = '', def build_schedule = '0 */6 * * *', def trigger_every_push = true, def notify_address = 'commits@beam.apache.org') { @@ -192,7 +192,9 @@ class common_job_properties { } // Enable triggering oneshots of pull requests - setPullRequestBuildTrigger(context, 'Jenkins PostCommit', '--none--', trigger_phrase) + if (trigger_phrase != '') { + setPullRequestBuildTrigger(context, 'Jenkins PostCommit', '--none--', trigger_phrase) + } context.publishers { // Notify an email address for each failed build (defaults to commits@). diff --git a/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy b/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy index 263a58445cdb..a288a8448211 100644 --- a/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy +++ b/.jenkins/job_beam_PostCommit_Java_MavenInstall.groovy @@ -34,8 +34,8 @@ mavenJob('beam_PostCommit_Java_MavenInstall') { // Set maven parameters. common_job_properties.setMavenConfig(delegate) - // Sets that this is a PostCommit job, and disables oneshots in precommit. - common_job_properties.setPostCommit(delegate, '') + // Sets that this is a PostCommit job. + common_job_properties.setPostCommit(delegate) // Maven goals for this job. goals('-B -e -P release,dataflow-runner clean install coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner" ]\'') From 8882f2a866b6319e8ae0523e2a36d77ae6bcfe68 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Wed, 1 Feb 2017 16:55:26 -0800 Subject: [PATCH 03/10] Address PR comments. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 2adb53843193..45693265bbfe 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -109,9 +109,9 @@ class common_job_properties { orgWhitelist(['apache']) allowMembersOfWhitelistedOrgsAsAdmin() permitAll() - if (postCommitPhrase != '') { + if (postCommitPhrase != '') { triggerPhrase(postcommitPhrase) - onlyTriggerPhrase() + onlyTriggerPhrase() } extensions { @@ -191,7 +191,9 @@ class common_job_properties { } } - // Enable triggering oneshots of pull requests + // Enable triggering oneshots of pull requests. Users can comment the trigger phrase + // speficied in the postcommit job and have the job run against their PR to run + // tests not in the presubmit suite for additional confidence. if (trigger_phrase != '') { setPullRequestBuildTrigger(context, 'Jenkins PostCommit', '--none--', trigger_phrase) } From a346d51b60bcfdb88b8211fdf723468c2fc09ef6 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Thu, 2 Feb 2017 12:38:13 -0800 Subject: [PATCH 04/10] Break out triggering into its own method and cascade changes. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 27 +++++++++++++------ ...tCommit_Java_RunnableOnService_Apex.groovy | 8 +++++- ...mit_Java_RunnableOnService_Dataflow.groovy | 8 +++++- ...Commit_Java_RunnableOnService_Flink.groovy | 8 +++++- ...mit_Java_RunnableOnService_Gearpump.groovy | 9 ++++++- ...Commit_Java_RunnableOnService_Spark.groovy | 8 +++++- .../job_beam_PostCommit_Python_Verify.groovy | 9 ++++++- .../job_beam_Release_NightlySnapshot.groovy | 1 - 8 files changed, 63 insertions(+), 15 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 45693265bbfe..5026690667bf 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -109,10 +109,14 @@ class common_job_properties { orgWhitelist(['apache']) allowMembersOfWhitelistedOrgsAsAdmin() permitAll() + // postCommitPhrase is the argument which gets set when we want to allow + // post-commit builds to run against pending pull requests. This block + // overrides the default trigger phrase with the new one and sets the + // build to happen only when it sees the trigger phrase. if (postCommitPhrase != '') { triggerPhrase(postcommitPhrase) onlyTriggerPhrase() - } + } extensions { commitStatus { @@ -176,6 +180,20 @@ class common_job_properties { setPullRequestBuildTrigger(context, commitStatusName, successComment) } + // Enable triggering postcommit runs against pull requests. Users can comment the trigger phrase + // specified in the postcommit job and have the job run against their PR to run + // tests not in the presubmit suite for additional confidence. + static def enableTriggeringOnPreCommit(def context, + def check_title, + def trigger_phrase) { + setPullRequestBuildTrigger( + context, + check_title, + '--none--', + trigger_phrase) + + } + // Sets common config for PostCommit jobs. static def setPostCommit(def context, def trigger_phrase = '', @@ -191,13 +209,6 @@ class common_job_properties { } } - // Enable triggering oneshots of pull requests. Users can comment the trigger phrase - // speficied in the postcommit job and have the job run against their PR to run - // tests not in the presubmit suite for additional confidence. - if (trigger_phrase != '') { - setPullRequestBuildTrigger(context, 'Jenkins PostCommit', '--none--', trigger_phrase) - } - context.publishers { // Notify an email address for each failed build (defaults to commits@). mailer(notify_address, false, true) diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy index 68d6e8011b17..25b233cd3b96 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy @@ -29,7 +29,13 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Apex') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate, 'Run Apex RunableOnService') + common_job_properties.setPostCommit(delegate) + + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Apex RunnableOnService Tests', + 'Run Apex RunableOnService') // Maven goals for this job. goals('''clean verify --projects runners/apex \ diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy index 73a00c20d68b..1a152b038ff2 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy @@ -32,7 +32,13 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Dataflow') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate, 'Run Dataflow RunnableOnService') + common_job_properties.setPostCommit(delegate) + + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Dataflow RunnableOnService Tests', + 'Run Dataflow RunableOnService') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/google-cloud-dataflow-java -DforkCount=0 -DrunnableOnServicePipelineOptions=\'[ "--runner=org.apache.beam.runners.dataflow.testing.TestDataflowRunner", "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-runnable-on-service-tests/" ]\'') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy index 65ba48373dae..48806025fde5 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy @@ -31,7 +31,13 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Flink') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate, 'Run Flink RunnableOnService') + common_job_properties.setPostCommit(delegate) + + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Flink RunnableOnService Tests', + 'Run Flink RunableOnService') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/flink/runner -Plocal-runnable-on-service-tests -Prunnable-on-service-tests') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index 8c388f3277eb..a6e20ef69b7f 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -36,7 +36,14 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { // Sets that this is a PostCommit job. // 0 5 31 2 * will run on Feb 31 (i.e. never) according to job properties. // This job triggers only on SCM, precommit is disabled as well. - common_job_properties.setPostCommit(delegate, '', '0 5 31 2 *') + common_job_properties.setPostCommit(delegate, '0 5 31 2 *') + + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Gearpump RunnableOnService Tests', + 'Run Gearpump RunableOnService') + // Maven goals for this job. goals('-B -e clean verify -am -pl runners/gearpump -DforkCount=0 -DrunnableOnServicePipelineOptions=\'[ "--runner=TestGearpumpRunner", "--streaming=false" ]\'') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy index 65eb7d820ae2..43c3309f6384 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy @@ -31,7 +31,13 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Spark') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate, 'Run Spark RunnableOnService') + common_job_properties.setPostCommit(delegate) + + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Spark RunnableOnService Tests', + 'Run Spark RunableOnService') // Maven goals for this job. goals('-B -e clean verify -am -pl runners/spark -Prunnable-on-service-tests -Plocal-runnable-on-service-tests -Dspark.port.maxRetries=64 -Dspark.ui.enabled=false') diff --git a/.jenkins/job_beam_PostCommit_Python_Verify.groovy b/.jenkins/job_beam_PostCommit_Python_Verify.groovy index ae00b6a56ead..a59d0e9f38f6 100644 --- a/.jenkins/job_beam_PostCommit_Python_Verify.groovy +++ b/.jenkins/job_beam_PostCommit_Python_Verify.groovy @@ -28,7 +28,14 @@ job('beam_PostCommit_Python_Verify') { common_job_properties.setTopLevelMainJobProperties(delegate) // Sets that this is a PostCommit job. - common_job_properties.setPostCommit(delegate, 'Run Python PostCommit', '0 3-22/6 * * *') + common_job_properties.setPostCommit(delegate, '0 3-22/6 * * *') + + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Python PostCommit Tests', + 'Run Python PostCommit') + // Execute shell command to test Python SDK. steps { diff --git a/.jenkins/job_beam_Release_NightlySnapshot.groovy b/.jenkins/job_beam_Release_NightlySnapshot.groovy index 94d528c9efcf..f2c3ff0740d5 100644 --- a/.jenkins/job_beam_Release_NightlySnapshot.groovy +++ b/.jenkins/job_beam_Release_NightlySnapshot.groovy @@ -36,7 +36,6 @@ mavenJob('beam_Release_NightlySnapshot') { // This is a post-commit job that runs once per day, not for every push. common_job_properties.setPostCommit( delegate, - '', '0 7 * * *', false, 'dev@beam.apache.org') From 652d734e5a131b9c06d42b760d93b8278223b12b Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Thu, 2 Feb 2017 12:39:36 -0800 Subject: [PATCH 05/10] fixup! Break out triggering into its own method and cascade changes. --- .jenkins/common_job_properties.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 5026690667bf..2552a87ec2ce 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -196,7 +196,6 @@ class common_job_properties { // Sets common config for PostCommit jobs. static def setPostCommit(def context, - def trigger_phrase = '', def build_schedule = '0 */6 * * *', def trigger_every_push = true, def notify_address = 'commits@beam.apache.org') { From 42727af05c6584662bac4137f10f59420cb0ac53 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Thu, 2 Feb 2017 12:41:19 -0800 Subject: [PATCH 06/10] fixup! Break out triggering into its own method and cascade changes. --- .../job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index a6e20ef69b7f..c0721a63f923 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -35,7 +35,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { // Sets that this is a PostCommit job. // 0 5 31 2 * will run on Feb 31 (i.e. never) according to job properties. - // This job triggers only on SCM, precommit is disabled as well. + // In post-commit this job triggers only on SCM changes. common_job_properties.setPostCommit(delegate, '0 5 31 2 *') // Allows triggering this build against pull requests. From e5903e36bbf4f04ae633011827fb5fa44eb8c7f8 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Thu, 2 Feb 2017 12:42:48 -0800 Subject: [PATCH 07/10] fixup! Break out triggering into its own method and cascade changes. --- ..._beam_PostCommit_Java_RunnableOnService_Gearpump.groovy | 1 - .jenkins/job_beam_PostCommit_Python_Verify.groovy | 1 - .jenkins/job_seed.groovy | 7 ++++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index c0721a63f923..610c3e3696f0 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -44,7 +44,6 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { 'Gearpump RunnableOnService Tests', 'Run Gearpump RunableOnService') - // Maven goals for this job. goals('-B -e clean verify -am -pl runners/gearpump -DforkCount=0 -DrunnableOnServicePipelineOptions=\'[ "--runner=TestGearpumpRunner", "--streaming=false" ]\'') } diff --git a/.jenkins/job_beam_PostCommit_Python_Verify.groovy b/.jenkins/job_beam_PostCommit_Python_Verify.groovy index a59d0e9f38f6..0ff8e3f45b4c 100644 --- a/.jenkins/job_beam_PostCommit_Python_Verify.groovy +++ b/.jenkins/job_beam_PostCommit_Python_Verify.groovy @@ -36,7 +36,6 @@ job('beam_PostCommit_Python_Verify') { 'Python PostCommit Tests', 'Run Python PostCommit') - // Execute shell command to test Python SDK. steps { shell('bash sdks/python/run_postcommit.sh') diff --git a/.jenkins/job_seed.groovy b/.jenkins/job_seed.groovy index ae13b2fa1460..6c8bf7e5e20d 100644 --- a/.jenkins/job_seed.groovy +++ b/.jenkins/job_seed.groovy @@ -31,11 +31,16 @@ job('beam_SeedJob') { // This is a post-commit job that runs once per day, not for every push. common_job_properties.setPostCommit( delegate, - 'Run Seed Job', '0 6 * * *', false, 'dev@beam.apache.org') + // Allows triggering this build against pull requests. + common_job_properties.enableTriggeringOnPreCommit( + delegate, + 'Jenkins Seed Job', + 'Run Seed Job') + steps { dsl { // A list or a glob of other groovy files to process. From 92e9221672b4a3c07f422fbf18578b57e50d8789 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Thu, 2 Feb 2017 15:55:39 -0800 Subject: [PATCH 08/10] Address PR comments. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 10 +++++----- ..._beam_PostCommit_Java_RunnableOnService_Apex.groovy | 2 +- ...m_PostCommit_Java_RunnableOnService_Dataflow.groovy | 2 +- ...beam_PostCommit_Java_RunnableOnService_Flink.groovy | 2 +- ...m_PostCommit_Java_RunnableOnService_Gearpump.groovy | 2 +- ...beam_PostCommit_Java_RunnableOnService_Spark.groovy | 2 +- .jenkins/job_beam_PostCommit_Python_Verify.groovy | 2 +- .jenkins/job_seed.groovy | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index 2552a87ec2ce..a3fa6594c4c9 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -101,7 +101,7 @@ class common_job_properties { private static def setPullRequestBuildTrigger(def context, def commitStatusContext, def successComment = '--none--', - def postCommitPhrase = '') { + def trigger_phrase = '') { context.triggers { githubPullRequest { admins(['asfbot']) @@ -109,12 +109,12 @@ class common_job_properties { orgWhitelist(['apache']) allowMembersOfWhitelistedOrgsAsAdmin() permitAll() - // postCommitPhrase is the argument which gets set when we want to allow + // trigger_phrase is the argument which gets set when we want to allow // post-commit builds to run against pending pull requests. This block // overrides the default trigger phrase with the new one and sets the // build to happen only when it sees the trigger phrase. - if (postCommitPhrase != '') { - triggerPhrase(postcommitPhrase) + if (trigger_phrase != '') { + triggerPhrase(trigger_phrase) onlyTriggerPhrase() } @@ -183,7 +183,7 @@ class common_job_properties { // Enable triggering postcommit runs against pull requests. Users can comment the trigger phrase // specified in the postcommit job and have the job run against their PR to run // tests not in the presubmit suite for additional confidence. - static def enableTriggeringOnPreCommit(def context, + static def enablePhraseTriggeringFromPullRequest(def context, def check_title, def trigger_phrase) { setPullRequestBuildTrigger( diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy index 25b233cd3b96..410ebcdda1bd 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy @@ -32,7 +32,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Apex') { common_job_properties.setPostCommit(delegate) // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Apex RunnableOnService Tests', 'Run Apex RunableOnService') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy index 1a152b038ff2..a3c8450c277a 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy @@ -35,7 +35,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Dataflow') { common_job_properties.setPostCommit(delegate) // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Dataflow RunnableOnService Tests', 'Run Dataflow RunableOnService') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy index 48806025fde5..b4381e726503 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy @@ -34,7 +34,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Flink') { common_job_properties.setPostCommit(delegate) // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Flink RunnableOnService Tests', 'Run Flink RunableOnService') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index 610c3e3696f0..7a1da9d17fed 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -39,7 +39,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { common_job_properties.setPostCommit(delegate, '0 5 31 2 *') // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Gearpump RunnableOnService Tests', 'Run Gearpump RunableOnService') diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy index 43c3309f6384..c55e981834fe 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy @@ -34,7 +34,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Spark') { common_job_properties.setPostCommit(delegate) // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Spark RunnableOnService Tests', 'Run Spark RunableOnService') diff --git a/.jenkins/job_beam_PostCommit_Python_Verify.groovy b/.jenkins/job_beam_PostCommit_Python_Verify.groovy index 0ff8e3f45b4c..4730768dde72 100644 --- a/.jenkins/job_beam_PostCommit_Python_Verify.groovy +++ b/.jenkins/job_beam_PostCommit_Python_Verify.groovy @@ -31,7 +31,7 @@ job('beam_PostCommit_Python_Verify') { common_job_properties.setPostCommit(delegate, '0 3-22/6 * * *') // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Python PostCommit Tests', 'Run Python PostCommit') diff --git a/.jenkins/job_seed.groovy b/.jenkins/job_seed.groovy index 6c8bf7e5e20d..6e590dfde31c 100644 --- a/.jenkins/job_seed.groovy +++ b/.jenkins/job_seed.groovy @@ -36,7 +36,7 @@ job('beam_SeedJob') { 'dev@beam.apache.org') // Allows triggering this build against pull requests. - common_job_properties.enableTriggeringOnPreCommit( + common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, 'Jenkins Seed Job', 'Run Seed Job') From 742b30272dea4d73f247d24d657658fd9455a32e Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Thu, 2 Feb 2017 17:17:21 -0800 Subject: [PATCH 09/10] Final PR comments. Signed-off-by: Jason Kuster --- .jenkins/common_job_properties.groovy | 12 ++++++------ ...eam_PostCommit_Java_RunnableOnService_Apex.groovy | 2 +- ...PostCommit_Java_RunnableOnService_Dataflow.groovy | 2 +- ...am_PostCommit_Java_RunnableOnService_Flink.groovy | 2 +- ...PostCommit_Java_RunnableOnService_Gearpump.groovy | 2 +- ...am_PostCommit_Java_RunnableOnService_Spark.groovy | 2 +- .jenkins/job_beam_PostCommit_Python_Verify.groovy | 2 +- .jenkins/job_beam_PreCommit_Website_Stage.groovy | 2 +- .jenkins/job_beam_PreCommit_Website_Test.groovy | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index a3fa6594c4c9..3c77aab8896a 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -111,8 +111,9 @@ class common_job_properties { permitAll() // trigger_phrase is the argument which gets set when we want to allow // post-commit builds to run against pending pull requests. This block - // overrides the default trigger phrase with the new one and sets the - // build to happen only when it sees the trigger phrase. + // overrides the default trigger phrase with the new one. Setting this + // will disable automatic invocation of this build; the phrase will be + // required to start it. if (trigger_phrase != '') { triggerPhrase(trigger_phrase) onlyTriggerPhrase() @@ -122,7 +123,7 @@ class common_job_properties { commitStatus { // This is the name that will show up in the GitHub pull request UI // for this Jenkins project. - delegate.context(commitStatusContext) + delegate.context("Jenkins: " + commitStatusContext) } /* @@ -184,14 +185,13 @@ class common_job_properties { // specified in the postcommit job and have the job run against their PR to run // tests not in the presubmit suite for additional confidence. static def enablePhraseTriggeringFromPullRequest(def context, - def check_title, + def commitStatusName, def trigger_phrase) { setPullRequestBuildTrigger( context, - check_title, + commitStatusName, '--none--', trigger_phrase) - } // Sets common config for PostCommit jobs. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy index 410ebcdda1bd..28ec4c3e5067 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy @@ -34,7 +34,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Apex') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Apex RunnableOnService Tests', + 'Apache Apex RunnableOnService Tests', 'Run Apex RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy index a3c8450c277a..659d765ac02b 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy @@ -37,7 +37,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Dataflow') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Dataflow RunnableOnService Tests', + 'Google Cloud Dataflow RunnableOnService Tests', 'Run Dataflow RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy index b4381e726503..11b0a0aac3a7 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy @@ -36,7 +36,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Flink') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Flink RunnableOnService Tests', + 'Apache Flink RunnableOnService Tests', 'Run Flink RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index 7a1da9d17fed..7b1efefe05c8 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -41,7 +41,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Gearpump RunnableOnService Tests', + 'Apache Gearpump RunnableOnService Tests', 'Run Gearpump RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy index c55e981834fe..ece7065832f7 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy @@ -36,7 +36,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Spark') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Spark RunnableOnService Tests', + 'Apache Spark RunnableOnService Tests', 'Run Spark RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Python_Verify.groovy b/.jenkins/job_beam_PostCommit_Python_Verify.groovy index 4730768dde72..c46cb3cfa15f 100644 --- a/.jenkins/job_beam_PostCommit_Python_Verify.groovy +++ b/.jenkins/job_beam_PostCommit_Python_Verify.groovy @@ -33,7 +33,7 @@ job('beam_PostCommit_Python_Verify') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Python PostCommit Tests', + 'Python SDK PostCommit Tests', 'Run Python PostCommit') // Execute shell command to test Python SDK. diff --git a/.jenkins/job_beam_PreCommit_Website_Stage.groovy b/.jenkins/job_beam_PreCommit_Website_Stage.groovy index 69be64d6b86c..7c64f1119bb5 100644 --- a/.jenkins/job_beam_PreCommit_Website_Stage.groovy +++ b/.jenkins/job_beam_PreCommit_Website_Stage.groovy @@ -29,7 +29,7 @@ job('beam_PreCommit_Website_Stage') { // Set pull request build trigger. common_job_properties.setPreCommit( delegate, - 'Jenkins: automatic staging of pull requests', + 'Automatic staging of pull requests', '\nJenkins built the site at commit id ${ghprbActualCommit} with ' + 'Jekyll and staged it [here](http://apache-beam-website-pull-' + 'requests.storage.googleapis.com/${ghprbPullId}/index.html). ' + diff --git a/.jenkins/job_beam_PreCommit_Website_Test.groovy b/.jenkins/job_beam_PreCommit_Website_Test.groovy index 2b55374fe14f..421b58a804e8 100644 --- a/.jenkins/job_beam_PreCommit_Website_Test.groovy +++ b/.jenkins/job_beam_PreCommit_Website_Test.groovy @@ -34,7 +34,7 @@ job('beam_PreCommit_Website_Test') { // Set pull request build trigger. common_job_properties.setPreCommit( delegate, - 'Jenkins: test website (dead links, etc.)') + 'Test website (dead links, etc.)') steps { // Run the following shell script as a build step. From b2a5b3a29c7eca31cf1bc09e65436112b5a02097 Mon Sep 17 00:00:00 2001 From: Jason Kuster Date: Fri, 3 Feb 2017 15:46:45 -0800 Subject: [PATCH 10/10] Final PR fixes. Signed-off-by: Jason Kuster --- .jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy | 2 +- .../job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy | 2 +- .../job_beam_PostCommit_Java_RunnableOnService_Flink.groovy | 2 +- .../job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy | 2 +- .../job_beam_PostCommit_Java_RunnableOnService_Spark.groovy | 2 +- .jenkins/job_beam_PreCommit_Java_MavenInstall.groovy | 2 +- .jenkins/job_seed.groovy | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy index 28ec4c3e5067..b2bed00a8efe 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Apex.groovy @@ -34,7 +34,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Apex') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Apache Apex RunnableOnService Tests', + 'Apache Apex Runner RunnableOnService Tests', 'Run Apex RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy index 659d765ac02b..c5336f1cccf8 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy @@ -37,7 +37,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Dataflow') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Google Cloud Dataflow RunnableOnService Tests', + 'Google Cloud Dataflow Runner RunnableOnService Tests', 'Run Dataflow RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy index 11b0a0aac3a7..d0062edd6ece 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Flink.groovy @@ -36,7 +36,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Flink') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Apache Flink RunnableOnService Tests', + 'Apache Flink Runner RunnableOnService Tests', 'Run Flink RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy index 7b1efefe05c8..17f6476af455 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Gearpump.groovy @@ -41,7 +41,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Gearpump') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Apache Gearpump RunnableOnService Tests', + 'Apache Gearpump Runner RunnableOnService Tests', 'Run Gearpump RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy index ece7065832f7..f58457fcc679 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Spark.groovy @@ -36,7 +36,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Spark') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Apache Spark RunnableOnService Tests', + 'Apache Spark Runner RunnableOnService Tests', 'Run Spark RunableOnService') // Maven goals for this job. diff --git a/.jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.jenkins/job_beam_PreCommit_Java_MavenInstall.groovy index ff2e476b6af1..371855159984 100644 --- a/.jenkins/job_beam_PreCommit_Java_MavenInstall.groovy +++ b/.jenkins/job_beam_PreCommit_Java_MavenInstall.groovy @@ -35,7 +35,7 @@ mavenJob('beam_PreCommit_Java_MavenInstall') { common_job_properties.setMavenConfig(delegate) // Sets that this is a PreCommit job. - common_job_properties.setPreCommit(delegate, 'Jenkins: Maven clean install') + common_job_properties.setPreCommit(delegate, 'Maven clean install') // Maven goals for this job. goals('-B -e -Prelease,include-runners,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report') diff --git a/.jenkins/job_seed.groovy b/.jenkins/job_seed.groovy index 6e590dfde31c..7e5272b7d0fc 100644 --- a/.jenkins/job_seed.groovy +++ b/.jenkins/job_seed.groovy @@ -38,7 +38,7 @@ job('beam_SeedJob') { // Allows triggering this build against pull requests. common_job_properties.enablePhraseTriggeringFromPullRequest( delegate, - 'Jenkins Seed Job', + 'Seed Job', 'Run Seed Job') steps {