You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/06/06 06:57:47 UTC
[GitHub] sijie closed pull request #1482: Remove phrase trigger on post
commit jobs
sijie closed pull request #1482: Remove phrase trigger on post commit jobs
URL: https://github.com/apache/bookkeeper/pull/1482
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.test-infra/jenkins/common_job_properties.groovy b/.test-infra/jenkins/common_job_properties.groovy
index 2a0b97152..999f9db50 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 cb15c3f20..42f2c3549 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 942fd092c..ec6c95ef3 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 f914f4474..de45c32ec 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 e796c9116..8a399375b 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 b9501d91d..c5543eb18 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 1990686e7..dd72c9352 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 c95ede702..61e9a0257 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 4e62b45e0..48adf34e1 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 2420c4c98..c4d65e3ae 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 f7811c8a0..f0cbbd019 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 f474bde9c..46e79f96d 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 f38c319be..df9092d03 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 cbcec6d01..6b1e32c06 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 a632e1517..0fd822898 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 5a941c09b..7dc7e7863 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 968e6cdb2..4feaa2fb5 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 fa2dd61aa..ced65276d 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 bffafacd3..c8b16b066 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 {
diff --git a/.travis.yml b/.travis.yml
index 5cda919a1..56b680546 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,6 @@ matrix:
env: CUSTOM_JDK="oraclejdk9"
- os: linux
env: CUSTOM_JDK="oraclejdk10"
- - os: linux
- dist: trusty
- env: CUSTOM_JDK="openjdk8"
before_install:
- |
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
index 65fe4c9ea..2fd84ad71 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
@@ -1111,7 +1111,7 @@ public void testAppendLedgersMapOnCacheRemoval() throws Exception {
EntryLogManagerForEntryLogPerLedger entryLogManager = (EntryLogManagerForEntryLogPerLedger) entryLogger
.getEntryLogManager();
- long ledgerId = 0l;
+ long ledgerId = 0L;
entryLogManager.createNewLog(ledgerId);
int entrySize = 200;
int numOfEntries = 4;
diff --git a/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java b/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java
index 907078973..73a458d1b 100644
--- a/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java
+++ b/tests/integration/cluster/src/test/java/org/apache/bookkeeper/tests/integration/cluster/BookKeeperClusterTestBase.java
@@ -21,11 +21,11 @@
import com.google.common.base.Stopwatch;
import java.net.URI;
import java.util.Optional;
+import java.util.Random;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.Random;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.common.concurrent.FutureUtils;
import org.apache.bookkeeper.conf.ClientConfiguration;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services