You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/06/06 06:57:45 UTC
[bookkeeper] branch master updated: Remove phrase trigger on post
commit jobs
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 08c1155 Remove phrase trigger on post commit jobs
08c1155 is described below
commit 08c115568b1ef63bcbfd885f5ef252b4f3db0720
Author: Sijie Guo <si...@apache.org>
AuthorDate: Tue Jun 5 23:57:38 2018 -0700
Remove phrase trigger on post commit jobs
Descriptions of the changes in this PR:
*Problem*
After enabling phrase trigger on precommit jobs to allow rerun individual precommit jobs, "retest this please" will run all the jobs including postcommit jobs.
*Solution*
Running postcommit jobs on pull requests doesn't make sense. This PR removes all the phrase trigger from postcommit jobs.
Additionally, fixes typos and also increases the timeout for integration tests.
Author: Sijie Guo <si...@apache.org>
Reviewers: Enrico Olivelli <eo...@gmail.com>, Jia Zhai <None>
This closes #1482 from sijie/fix_typoes
---
.test-infra/jenkins/common_job_properties.groovy | 16 ++++++++++++++++
.../job_bookkeeper_postcommit_master_java8.groovy | 6 ------
.../job_bookkeeper_postcommit_master_java9.groovy | 6 ------
.../job_bookkeeper_postcommit_validation_master.groovy | 6 ------
.../jenkins/job_bookkeeper_postcommit_website.groovy | 6 ------
.../jenkins/job_bookkeeper_precommit_bookie_tests.groovy | 4 ++--
.../jenkins/job_bookkeeper_precommit_client_tests.groovy | 4 ++--
.../job_bookkeeper_precommit_integrationtests.groovy | 6 +++---
.../jenkins/job_bookkeeper_precommit_java8.groovy | 6 +++---
.../jenkins/job_bookkeeper_precommit_java9.groovy | 6 +++---
.../job_bookkeeper_precommit_remaining_tests.groovy | 4 ++--
.../job_bookkeeper_precommit_replication_tests.groovy | 4 ++--
.../jenkins/job_bookkeeper_precommit_tls_tests.groovy | 4 ++--
.../jenkins/job_bookkeeper_precommit_validation.groovy | 4 ++--
.../jenkins/job_bookkeeper_release_branch_46.groovy | 6 ------
.../job_bookkeeper_release_branch_47_java8.groovy | 6 ------
.../job_bookkeeper_release_branch_47_java9.groovy | 6 ------
.../job_bookkeeper_release_nightly_snapshot.groovy | 6 ------
.test-infra/jenkins/job_seed.groovy | 6 ------
19 files changed, 37 insertions(+), 75 deletions(-)
diff --git a/.test-infra/jenkins/common_job_properties.groovy b/.test-infra/jenkins/common_job_properties.groovy
index 2a0b971..999f9db 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -160,6 +160,22 @@ class common_job_properties {
}
}
}
+ // Comment messages after build completes.
+ context.configure {
+ def messages = it / triggers / 'org.jenkinsci.plugins.ghprb.GhprbTrigger' / extensions / 'org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus' / messages
+ messages << 'org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildResultMessage' {
+ message('--none--')
+ result('SUCCESS')
+ }
+ messages << 'org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildResultMessage' {
+ message('--none--')
+ result('ERROR')
+ }
+ messages << 'org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildResultMessage' {
+ message('--none--')
+ result('FAILURE')
+ }
+ }
}
// Sets common config for Maven jobs.
diff --git a/.test-infra/jenkins/job_bookkeeper_postcommit_master_java8.groovy b/.test-infra/jenkins/job_bookkeeper_postcommit_master_java8.groovy
index cb15c3f..42f2c35 100644
--- a/.test-infra/jenkins/job_bookkeeper_postcommit_master_java8.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_postcommit_master_java8.groovy
@@ -32,12 +32,6 @@ mavenJob('bookkeeper_postcommit_master_java8') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Java 8 Test',
- '/test-java8')
-
// Set maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_postcommit_master_java9.groovy b/.test-infra/jenkins/job_bookkeeper_postcommit_master_java9.groovy
index 942fd09..ec6c95e 100644
--- a/.test-infra/jenkins/job_bookkeeper_postcommit_master_java9.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_postcommit_master_java9.groovy
@@ -32,12 +32,6 @@ mavenJob('bookkeeper_postcommit_master_java9') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Java 9 Test',
- '/test-java9')
-
// Set maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_postcommit_validation_master.groovy b/.test-infra/jenkins/job_bookkeeper_postcommit_validation_master.groovy
index f914f44..de45c32 100644
--- a/.test-infra/jenkins/job_bookkeeper_postcommit_validation_master.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_postcommit_validation_master.groovy
@@ -32,12 +32,6 @@ mavenJob('bookkeeper_postcommit_validation_master') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Postcommit Validation',
- '/postcommit-validation')
-
// Set maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_postcommit_website.groovy b/.test-infra/jenkins/job_bookkeeper_postcommit_website.groovy
index e796c91..8a39937 100644
--- a/.test-infra/jenkins/job_bookkeeper_postcommit_website.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_postcommit_website.groovy
@@ -28,12 +28,6 @@ job('bookkeeper_postcommit_publish_website') {
// Sets that this is a WebsitePostCommit job.
common_job_properties.setWebsitePostCommit(delegate)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Build Website',
- '/build-website')
-
steps {
// Run the following shell script as a build step.
shell '''
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_bookie_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_bookie_tests.groovy
index b9501d9..c5543eb 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_bookie_tests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_bookie_tests.groovy
@@ -32,14 +32,14 @@ freeStyleJob('bookkeeper_precommit_bookie_tests') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'Bookie Tests',
'.*(re)?run (bookie )?tests.*',
- '.*\[skip (bookie )?tests\].*',
+ '.*\\[skip (bookie )?tests\\].*',
true)
steps {
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_client_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_client_tests.groovy
index 1990686..dd72c93 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_client_tests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_client_tests.groovy
@@ -32,14 +32,14 @@ freeStyleJob('bookkeeper_precommit_client_tests') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'Client Tests',
'.*(re)?run (client )?tests.*',
- '.*\[skip (client )?tests\].*',
+ '.*\\[skip (client )?tests\\].*',
true)
steps {
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
index c95ede7..61e9a02 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
@@ -27,9 +27,9 @@ freeStyleJob('bookkeeper_precommit_integrationtests') {
delegate,
'master',
'JDK 1.8 (latest)',
- 120,
+ 200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
throttleConcurrentBuilds {
// limit builds to 1 per node to avoid conflicts on building docker images
@@ -41,7 +41,7 @@ freeStyleJob('bookkeeper_precommit_integrationtests') {
delegate,
'Integration Tests',
'.*(re)?run integration tests.*',
- '.*\[skip integration tests\].*')
+ '.*\\[skip integration tests\\].*')
steps {
// Temporary information gathering to see if full disks are causing the builds to flake
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_java8.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_java8.groovy
index 4e62b45..48adf34 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_java8.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_java8.groovy
@@ -41,14 +41,14 @@ mavenJob('bookkeeper_precommit_pullrequest_java8') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'Build (Java 8)',
- '.*(re)?build( java8)?.*',
- '.*\[skip build( java8)?\].*')
+ '.*(re)?build java8?.*',
+ '.*\\[skip build java8?\\].*')
// Set Maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_java9.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_java9.groovy
index 2420c4c..c4d65e3 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_java9.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_java9.groovy
@@ -41,14 +41,14 @@ mavenJob('bookkeeper_precommit_pullrequest_java9') {
'JDK 1.9 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'Build (Java 9)',
- '.*(re)?build( java9)?.*',
- '.*\[skip build( java9)?\].*')
+ '.*(re)?build java9?.*',
+ '.*\\[skip build java9?\\].*')
// Set Maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_remaining_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_remaining_tests.groovy
index f7811c8..f0cbbd0 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_remaining_tests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_remaining_tests.groovy
@@ -36,14 +36,14 @@ freeStyleJob('bookkeeper_precommit_remaining_tests') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'All Other Tests',
'.*(re)?run (remaining )?tests.*',
- '.*\[skip (remaining )?tests\].*',
+ '.*\\[skip (remaining )?tests\\].*',
true)
steps {
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_replication_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_replication_tests.groovy
index f474bde..46e79f9 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_replication_tests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_replication_tests.groovy
@@ -32,14 +32,14 @@ freeStyleJob('bookkeeper_precommit_replication_tests') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'Replication Tests',
'.*(re)?run (replication )?tests.*',
- '.*\[skip (replication )?tests\].*',
+ '.*\\[skip (replication )?tests\\].*',
true)
steps {
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_tls_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_tls_tests.groovy
index f38c319..df9092d 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_tls_tests.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_tls_tests.groovy
@@ -32,14 +32,14 @@ freeStyleJob('bookkeeper_precommit_tls_tests') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'TLS Tests',
'.*(re)?run (tls )?tests.*',
- '.*\[skip (tls )?tests\].*',
+ '.*\\[skip (tls )?tests\\].*',
true)
steps {
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_validation.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_validation.groovy
index cbcec6d..6b1e32c 100644
--- a/.test-infra/jenkins/job_bookkeeper_precommit_validation.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_precommit_validation.groovy
@@ -32,14 +32,14 @@ mavenJob('bookkeeper_precommit_pullrequest_validation') {
'JDK 1.8 (latest)',
200,
'ubuntu',
- '${ghprbTargetBranch}')
+ '${ghprbActualCommit}')
// Sets that this is a PreCommit job.
common_job_properties.setPreCommit(
delegate,
'PR Validation',
'.*(re)?run pr validation.*',
- ''
+ '',
true)
// Set Maven parameters.
diff --git a/.test-infra/jenkins/job_bookkeeper_release_branch_46.groovy b/.test-infra/jenkins/job_bookkeeper_release_branch_46.groovy
index a632e15..0fd8228 100644
--- a/.test-infra/jenkins/job_bookkeeper_release_branch_46.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_release_branch_46.groovy
@@ -33,12 +33,6 @@ mavenJob('bookkeeper_release_branch_46') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Release Branch 4.6 Test',
- '/test-release-branch-46')
-
// Set maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_release_branch_47_java8.groovy b/.test-infra/jenkins/job_bookkeeper_release_branch_47_java8.groovy
index 5a941c0..7dc7e78 100644
--- a/.test-infra/jenkins/job_bookkeeper_release_branch_47_java8.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_release_branch_47_java8.groovy
@@ -32,12 +32,6 @@ mavenJob('bookkeeper_release_branch_47_java8') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Release Branch 4.7 Java 8 Test',
- '/test-release-branch-47-java8')
-
// Set maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_release_branch_47_java9.groovy b/.test-infra/jenkins/job_bookkeeper_release_branch_47_java9.groovy
index 968e6cd..4feaa2f 100644
--- a/.test-infra/jenkins/job_bookkeeper_release_branch_47_java9.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_release_branch_47_java9.groovy
@@ -32,12 +32,6 @@ mavenJob('bookkeeper_release_branch_47_java9') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Release Branch 4.7 Java 9 Test',
- '/test-release-branch-47-java9')
-
// Set maven parameters.
common_job_properties.setMavenConfig(delegate)
diff --git a/.test-infra/jenkins/job_bookkeeper_release_nightly_snapshot.groovy b/.test-infra/jenkins/job_bookkeeper_release_nightly_snapshot.groovy
index fa2dd61..ced6527 100644
--- a/.test-infra/jenkins/job_bookkeeper_release_nightly_snapshot.groovy
+++ b/.test-infra/jenkins/job_bookkeeper_release_nightly_snapshot.groovy
@@ -31,12 +31,6 @@ freeStyleJob('bookkeeper_release_nightly_snapshot') {
'H 12 * * *',
false)
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Release Snapshot',
- '/release-snapshot')
-
parameters {
stringParam(
'sha1',
diff --git a/.test-infra/jenkins/job_seed.groovy b/.test-infra/jenkins/job_seed.groovy
index bffafac..c8b16b0 100644
--- a/.test-infra/jenkins/job_seed.groovy
+++ b/.test-infra/jenkins/job_seed.groovy
@@ -33,12 +33,6 @@ job('bookkeeper-seed') {
false,
'issues@bookkeeper.apache.org')
- // Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Seed Job',
- '/seed')
-
steps {
folder('bookkeeper-jenkins-testing')
dsl {
--
To stop receiving notification emails like this one, please contact
sijie@apache.org.