You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/10/09 20:11:53 UTC
[1/6] beam git commit: Enable phrase triggering of Go PreCommit
Repository: beam
Updated Branches:
refs/heads/master 61777b433 -> 296f7fa96
Enable phrase triggering of Go PreCommit
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/687828f0
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/687828f0
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/687828f0
Branch: refs/heads/master
Commit: 687828f0b75b1b8e6fbc29bc6058d58368624a90
Parents: 834494a
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Oct 6 14:19:43 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 9 09:10:06 2017 -0700
----------------------------------------------------------------------
.test-infra/jenkins/job_beam_PreCommit_Go_MavenInstall.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/687828f0/.test-infra/jenkins/job_beam_PreCommit_Go_MavenInstall.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Go_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Go_MavenInstall.groovy
index d078c89..c616edc 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Go_MavenInstall.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Go_MavenInstall.groovy
@@ -38,7 +38,7 @@ mavenJob('beam_PreCommit_Go_MavenInstall') {
common_job_properties.setMavenConfig(delegate)
// Sets that this is a PreCommit job.
- common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/go -am -amd')
+ common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/go -am -amd', 'Run Go PreCommit')
// Maven goals for this job: The Go SDK, its dependencies, and things that depend on it.
goals('''\
[2/6] beam git commit: Allow precommits to coexist with phrase
triggering
Posted by ke...@apache.org.
Allow precommits to coexist with phrase triggering
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6416deb0
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6416deb0
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6416deb0
Branch: refs/heads/master
Commit: 6416deb0f1a706c7ef899f8a227e225ea5a3c2d9
Parents: ec5e724
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Oct 6 14:14:29 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 9 09:10:06 2017 -0700
----------------------------------------------------------------------
.test-infra/jenkins/common_job_properties.groovy | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/6416deb0/.test-infra/jenkins/common_job_properties.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/common_job_properties.groovy b/.test-infra/jenkins/common_job_properties.groovy
index 87763a2..c6a8b27 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -122,8 +122,9 @@ class common_job_properties {
// below to insulate callers from internal parameter defaults.
private static void setPullRequestBuildTrigger(context,
String commitStatusContext,
- String successComment = '--none--',
- String prTriggerPhrase = '') {
+ String prTriggerPhrase = '',
+ boolean onlyTriggerPhraseToggle = true,
+ String successComment = '--none--') {
context.triggers {
githubPullRequest {
admins(['asfbot'])
@@ -138,6 +139,8 @@ class common_job_properties {
// required to start it.
if (prTriggerPhrase) {
triggerPhrase(prTriggerPhrase)
+ }
+ if (onlyTriggerPhraseToggle) {
onlyTriggerPhrase()
}
@@ -182,9 +185,10 @@ class common_job_properties {
// Sets common config for PreCommit jobs.
static void setPreCommit(context,
String commitStatusName,
+ String prTriggerPhrase = '',
String successComment = '--none--') {
// Set pull request build trigger.
- setPullRequestBuildTrigger(context, commitStatusName, successComment)
+ setPullRequestBuildTrigger(context, commitStatusName, prTriggerPhrase, false, successComment)
}
// Enable triggering postcommit runs against pull requests. Users can comment the trigger phrase
@@ -196,8 +200,9 @@ class common_job_properties {
setPullRequestBuildTrigger(
context,
commitStatusName,
- '--none--',
- prTriggerPhrase)
+ prTriggerPhrase,
+ true,
+ '--none--')
}
// Sets common config for PostCommit jobs.
[4/6] beam git commit: Restore Python precommit
Posted by ke...@apache.org.
Restore Python precommit
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b47c372b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b47c372b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b47c372b
Branch: refs/heads/master
Commit: b47c372b35680a15226824dfe245156465d75de2
Parents: 6416deb
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Oct 6 14:14:43 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 9 09:10:06 2017 -0700
----------------------------------------------------------------------
.../jenkins/job_beam_PreCommit_Python_MavenInstall.groovy | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b47c372b/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy
index 5ce1391..eae129b 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Python_MavenInstall.groovy
@@ -38,13 +38,7 @@ mavenJob('beam_PreCommit_Python_MavenInstall') {
common_job_properties.setMavenConfig(delegate)
// Sets that this is a PreCommit job.
- common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/python -am -amd')
-
- // Enable Triggering these tests with a comment in the pull request
- common_job_properties.enablePhraseTriggeringFromPullRequest(
- delegate,
- 'Python SDK PreCommit Tests',
- 'Run Python PreCommit')
+ common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/python -am -amd', 'Run Python PreCommit')
// Maven goals for this job: The Python SDK, its dependencies, and things that depend on it.
goals('''\
[5/6] beam git commit: Add runners/direct-java to Java precommit
Posted by ke...@apache.org.
Add runners/direct-java to Java precommit
Previously `-pl sdks/java/core -am -amd` was our Maven shorthand for getting
"everything" into the Maven reactor.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/cdefb111
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/cdefb111
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/cdefb111
Branch: refs/heads/master
Commit: cdefb111b542b70667e015d0370f2bee22531284
Parents: 687828f
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 9 09:11:06 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 9 09:14:25 2017 -0700
----------------------------------------------------------------------
.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/cdefb111/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
index e8f87b9..8721468 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
@@ -38,14 +38,14 @@ mavenJob('beam_PreCommit_Java_MavenInstall') {
common_job_properties.setMavenConfig(delegate)
// Sets that this is a PreCommit job.
- common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/java/core -am -amd', 'Run Java PreCommit')
+ common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/java/core,runners/direct-java -am -amd', 'Run Java PreCommit')
// Maven goals for this job: The Java SDK, its dependencies, and things that depend on it.
goals('''\
--batch-mode \
--errors \
--activate-profiles release,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner \
- --projects sdks/java/core \
+ --projects sdks/java/core,runners/direct-java \
--also-make \
--also-make-dependents \
-D repoToken=$COVERALLS_REPO_TOKEN \
[6/6] beam git commit: This closes #3956: Restore Python precommit;
enable phrase triggering for precommits in general
Posted by ke...@apache.org.
This closes #3956: Restore Python precommit; enable phrase triggering for precommits in general
Add runners/direct-java to Java precommit
Enable phrase triggering of Go PreCommit
Enable phrase triggering of Java PreCommit
Restore Python precommit
Allow precommits to coexist with phrase triggering
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/296f7fa9
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/296f7fa9
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/296f7fa9
Branch: refs/heads/master
Commit: 296f7fa96742147bc799afec1c7e90f0c61540be
Parents: 61777b4 cdefb11
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 9 13:11:30 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 9 13:11:30 2017 -0700
----------------------------------------------------------------------
.test-infra/jenkins/common_job_properties.groovy | 15 ++++++++++-----
.../job_beam_PreCommit_Go_MavenInstall.groovy | 2 +-
.../job_beam_PreCommit_Java_MavenInstall.groovy | 4 ++--
.../job_beam_PreCommit_Python_MavenInstall.groovy | 8 +-------
4 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[3/6] beam git commit: Enable phrase triggering of Java PreCommit
Posted by ke...@apache.org.
Enable phrase triggering of Java PreCommit
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/834494a9
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/834494a9
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/834494a9
Branch: refs/heads/master
Commit: 834494a9b2cd7027ca8b7d7e05abac608b56a54a
Parents: b47c372
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Oct 6 14:17:28 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 9 09:10:06 2017 -0700
----------------------------------------------------------------------
.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/834494a9/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
index dad3726..e8f87b9 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
@@ -38,7 +38,7 @@ mavenJob('beam_PreCommit_Java_MavenInstall') {
common_job_properties.setMavenConfig(delegate)
// Sets that this is a PreCommit job.
- common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/java/core -am -amd')
+ common_job_properties.setPreCommit(delegate, 'mvn clean install -pl sdks/java/core -am -amd', 'Run Java PreCommit')
// Maven goals for this job: The Java SDK, its dependencies, and things that depend on it.
goals('''\