You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2022/07/07 13:34:52 UTC
[beam] branch master updated: Reenable Jenkins comment triggers (#22169)
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new df162c1e2fb Reenable Jenkins comment triggers (#22169)
df162c1e2fb is described below
commit df162c1e2fb221c64cd861605fb35b37d2e6b8ec
Author: Danny McCormick <da...@google.com>
AuthorDate: Thu Jul 7 09:34:45 2022 -0400
Reenable Jenkins comment triggers (#22169)
* Reenable Jenkins comment triggers
* Missed bigquery
* Missed kafka
* Spotless apply
---
.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy | 6 ++----
.test-infra/jenkins/PostcommitJobBuilder.groovy | 12 +-----------
.../jenkins/job_PerformanceTests_BigQueryIO_Java.groovy | 3 +--
.../jenkins/job_PerformanceTests_FileBasedIO_IT.groovy | 6 ++----
.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy | 9 ++++-----
.../jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy | 9 ++++-----
.test-infra/jenkins/job_PerformanceTests_JDBC.groovy | 9 ++++-----
.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy | 9 ++++-----
.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy | 9 ++++-----
.test-infra/jenkins/job_PerformanceTests_Python.groovy | 11 +++++------
.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy | 3 +--
.test-infra/jenkins/job_PostCommit_Go.groovy | 2 +-
.test-infra/jenkins/job_PostCommit_Java.groovy | 2 +-
.../job_PostCommit_Java_ValidatesRunner_Dataflow.groovy | 2 +-
.test-infra/jenkins/job_PostCommit_Python.groovy | 2 +-
.../jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy | 9 ++++-----
16 files changed, 40 insertions(+), 63 deletions(-)
diff --git a/.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy b/.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy
index 09e8d835d51..bccb6b6c904 100644
--- a/.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy
+++ b/.test-infra/jenkins/PhraseTriggeringPostCommitBuilder.groovy
@@ -28,9 +28,7 @@ class PhraseTriggeringPostCommitBuilder extends PostcommitJobBuilder {
githubUiHint,
scope,
jobDefinition = {}) {
-
- // [Issue#21824] Disable trigger
- // new PostcommitJobBuilder(scope, jobDefinition).defineGhprbTriggeredJob(
- // nameBase + "_PR", triggerPhrase, githubUiHint, false)
+ new PostcommitJobBuilder(scope, jobDefinition).defineGhprbTriggeredJob(
+ nameBase + "_PR", triggerPhrase, githubUiHint, false)
}
}
diff --git a/.test-infra/jenkins/PostcommitJobBuilder.groovy b/.test-infra/jenkins/PostcommitJobBuilder.groovy
index 2cd60103b1e..70d37595d05 100644
--- a/.test-infra/jenkins/PostcommitJobBuilder.groovy
+++ b/.test-infra/jenkins/PostcommitJobBuilder.groovy
@@ -39,7 +39,7 @@ class PostcommitJobBuilder {
* Set the job details.
*
* @param nameBase Job name for the postcommit job, a _PR suffix added if the trigger is set.
- * @param triggerPhrase Phrase to trigger jobs, [Issue#21824] IGNORED.
+ * @param triggerPhrase Phrase to trigger jobs, empty to not have a trigger.
* @param githubUiHint Short description in the github UI.
* @param scope Delegate for the job.
* @param jobDefinition Closure for the job.
@@ -51,16 +51,6 @@ class PostcommitJobBuilder {
jobDefinition = {}) {
PostcommitJobBuilder jb = new PostcommitJobBuilder(scope, jobDefinition)
jb.defineAutoPostCommitJob(nameBase)
- }
-
- static void postCommitJobWithTrigger(nameBase,
- triggerPhrase,
- githubUiHint,
- scope,
- jobDefinition = {}) {
- PostcommitJobBuilder jb = new PostcommitJobBuilder(scope, jobDefinition)
- jb.defineAutoPostCommitJob(nameBase)
-
if (triggerPhrase) {
jb.defineGhprbTriggeredJob(nameBase + "_PR", triggerPhrase, githubUiHint, false)
}
diff --git a/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy b/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy
index 261f1fa0ef8..1d8ce84ea12 100644
--- a/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy
@@ -118,8 +118,7 @@ private void createPostCommitJob(jobConfig) {
job(jobConfig.name) {
description(jobConfig.description)
common.setTopLevelMainJobProperties(delegate)
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(delegate, jobConfig.title, jobConfig.triggerPhrase)
+ common.enablePhraseTriggeringFromPullRequest(delegate, jobConfig.title, jobConfig.triggerPhrase)
common.setAutoJob(delegate, 'H H/6 * * *')
publishers {
archiveJunit('**/build/test-results/**/*.xml')
diff --git a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
index 28bdda5993f..d3ec50c7a2f 100644
--- a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
@@ -286,8 +286,7 @@ private void createGCSFileBasedIOITTestJob(testJob) {
job(testJob.name) {
description(testJob.description)
common.setTopLevelMainJobProperties(delegate)
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(delegate, testJob.githubTitle, testJob.githubTriggerPhrase)
+ common.enablePhraseTriggeringFromPullRequest(delegate, testJob.githubTitle, testJob.githubTriggerPhrase)
common.setAutoJob(delegate, 'H H/6 * * *')
InfluxDBCredentialsHelper.useCredentials(delegate)
additionalPipelineArgs = [
@@ -340,8 +339,7 @@ private void createHDFSFileBasedIOITTestJob(testJob) {
job(testJob.name) {
description(testJob.description)
common.setTopLevelMainJobProperties(delegate)
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(delegate, testJob.githubTitle, testJob.githubTriggerPhrase)
+ common.enablePhraseTriggeringFromPullRequest(delegate, testJob.githubTitle, testJob.githubTriggerPhrase)
common.setAutoJob(delegate, 'H H/6 * * *')
InfluxDBCredentialsHelper.useCredentials(delegate)
additionalPipelineArgs = [
diff --git a/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy b/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy
index 5c29ef18fbb..73fde9f2f64 100644
--- a/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy
@@ -25,11 +25,10 @@ String jobName = "beam_PerformanceTests_HadoopFormat"
job(jobName) {
common.setTopLevelMainJobProperties(delegate)
common.setAutoJob(delegate, 'H H/6 * * *')
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // 'Java HadoopFormatIO Performance Test',
- // 'Run Java HadoopFormatIO Performance Test')
+ common.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'Java HadoopFormatIO Performance Test',
+ 'Run Java HadoopFormatIO Performance Test')
InfluxDBCredentialsHelper.useCredentials(delegate)
String namespace = common.getKubernetesNamespace(jobName)
diff --git a/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy
index 2b3010416db..83cd2af3e9e 100644
--- a/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy
@@ -23,11 +23,10 @@ String jobName = "beam_PerformanceTests_InfluxDbIO_IT"
job(jobName) {
common.setTopLevelMainJobProperties(delegate)
common.setAutoJob(delegate,'H H/6 * * *')
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // 'Java InfluxDbIO Performance Test',
- // 'Run Java InfluxDbIO Performance Test')
+ common.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'Java InfluxDbIO Performance Test',
+ 'Run Java InfluxDbIO Performance Test')
String namespace = common.getKubernetesNamespace(jobName)
String kubeconfigPath = common.getKubeconfigLocationForNamespace(namespace)
diff --git a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
index 7f72d65bd7c..f41f4adf35a 100644
--- a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
@@ -25,11 +25,10 @@ String jobName = "beam_PerformanceTests_JDBC"
job(jobName) {
common.setTopLevelMainJobProperties(delegate)
common.setAutoJob(delegate, 'H H/6 * * *')
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // 'Java JdbcIO Performance Test',
- // 'Run Java JdbcIO Performance Test')
+ common.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'Java JdbcIO Performance Test',
+ 'Run Java JdbcIO Performance Test')
InfluxDBCredentialsHelper.useCredentials(delegate)
String namespace = common.getKubernetesNamespace(jobName)
diff --git a/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy
index 8aaa59ebf40..6d5efaa6de2 100644
--- a/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy
@@ -36,11 +36,10 @@ String HIGH_RANGE_PORT = "32767"
job(jobName) {
common.setTopLevelMainJobProperties(delegate, 'master', 120)
common.setAutoJob(delegate, 'H H/6 * * *')
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // 'Java KafkaIO Performance Test',
- // 'Run Java KafkaIO Performance Test')
+ common.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'Java KafkaIO Performance Test',
+ 'Run Java KafkaIO Performance Test')
InfluxDBCredentialsHelper.useCredentials(delegate)
String namespace = common.getKubernetesNamespace(jobName)
diff --git a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
index ca9858de6b0..c9bc59eb858 100644
--- a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
@@ -25,11 +25,10 @@ String jobName = "beam_PerformanceTests_MongoDBIO_IT"
job(jobName) {
common.setTopLevelMainJobProperties(delegate)
common.setAutoJob(delegate,'H H/6 * * *')
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // 'Java MongoDBIO Performance Test',
- // 'Run Java MongoDBIO Performance Test')
+ common.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'Java MongoDBIO Performance Test',
+ 'Run Java MongoDBIO Performance Test')
InfluxDBCredentialsHelper.useCredentials(delegate)
String namespace = common.getKubernetesNamespace(jobName)
diff --git a/.test-infra/jenkins/job_PerformanceTests_Python.groovy b/.test-infra/jenkins/job_PerformanceTests_Python.groovy
index e653e6d4e54..282f2db4c28 100644
--- a/.test-infra/jenkins/job_PerformanceTests_Python.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_Python.groovy
@@ -72,13 +72,12 @@ private void createPythonPerformanceTestJob(Map testConfig) {
// Run job in postcommit, don't trigger every push.
commonJobProperties.setAutoJob(delegate, 'H H/6 * * *')
- // [Issue#21824] Disable trigger
// Allows triggering this build against pull requests.
- // commonJobProperties.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // testConfig.jobDescription,
- // testConfig.jobTriggerPhrase,
- // )
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ testConfig.jobDescription,
+ testConfig.jobTriggerPhrase,
+ )
publishers {
archiveJunit('**/pytest*.xml')
diff --git a/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy b/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy
index 5f8b849b757..3fffe394802 100644
--- a/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy
@@ -43,8 +43,7 @@ private void createPostCommitJob(jobConfig) {
job(jobConfig.name) {
description(jobConfig.description)
common.setTopLevelMainJobProperties(delegate)
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(delegate, jobConfig.title, jobConfig.triggerPhrase)
+ common.enablePhraseTriggeringFromPullRequest(delegate, jobConfig.title, jobConfig.triggerPhrase)
common.setAutoJob(delegate, 'H H/6 * * *')
publishers {
archiveJunit('**/build/test-results/**/*.xml')
diff --git a/.test-infra/jenkins/job_PostCommit_Go.groovy b/.test-infra/jenkins/job_PostCommit_Go.groovy
index 2cdc8a4ec13..8202cc7ccf3 100644
--- a/.test-infra/jenkins/job_PostCommit_Go.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Go.groovy
@@ -21,7 +21,7 @@ import PostcommitJobBuilder
// This is the Go postcommit which runs a gradle build, and the current set
// of postcommit tests.
-PostcommitJobBuilder.postCommitJobWithTrigger('beam_PostCommit_Go', 'Run Go PostCommit',
+PostcommitJobBuilder.postCommitJob('beam_PostCommit_Go', 'Run Go PostCommit',
'./gradlew :goPostCommit', this) {
description('Runs Go PostCommit tests against master.')
previousNames(/beam_PostCommit_Go_GradleBuild/)
diff --git a/.test-infra/jenkins/job_PostCommit_Java.groovy b/.test-infra/jenkins/job_PostCommit_Java.groovy
index 8ee8e6b1f01..cb3e0930dc8 100644
--- a/.test-infra/jenkins/job_PostCommit_Java.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java.groovy
@@ -22,7 +22,7 @@ import PostcommitJobBuilder
// This job runs the Java postcommit tests, including the suite of integration
// tests.
-PostcommitJobBuilder.postCommitJobWithTrigger('beam_PostCommit_Java', 'Run Java PostCommit',
+PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java', 'Run Java PostCommit',
'Java SDK Post Commit Tests', this) {
description('Runs PostCommit tests on the Java SDK.')
diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
index b5e2e953212..b0c0fa2c6e4 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
@@ -22,7 +22,7 @@ import PostcommitJobBuilder
// This job runs the suite of ValidatesRunner tests against the Dataflow
// runner.
-PostcommitJobBuilder.postCommitJobWithTrigger('beam_PostCommit_Java_ValidatesRunner_Dataflow',
+PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Dataflow',
'Run Dataflow ValidatesRunner', 'Google Cloud Dataflow Runner ValidatesRunner Tests (streaming/batch auto)', this) {
description('Runs the ValidatesRunner suite on the Dataflow runner.')
diff --git a/.test-infra/jenkins/job_PostCommit_Python.groovy b/.test-infra/jenkins/job_PostCommit_Python.groovy
index bd6ecb471ad..9785e7c7384 100644
--- a/.test-infra/jenkins/job_PostCommit_Python.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python.groovy
@@ -24,7 +24,7 @@ import static PythonTestProperties.ALL_SUPPORTED_VERSIONS
// This job defines the Python postcommit tests.
ALL_SUPPORTED_VERSIONS.each { pythonVersion ->
def versionSuffix = pythonVersion.replace('.', '')
- PostcommitJobBuilder.postCommitJobWithTrigger("beam_PostCommit_Python${versionSuffix}",
+ PostcommitJobBuilder.postCommitJob("beam_PostCommit_Python${versionSuffix}",
"Run Python ${pythonVersion} PostCommit",
"Python${versionSuffix}_PC(\"Run Python ${pythonVersion} PostCommit\")", this) {
description('Runs Python postcommit tests using Python ${pythonVersion}.')
diff --git a/.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy b/.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy
index b113e256a36..bee2b8f6e25 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy
@@ -23,11 +23,10 @@ String jobName = "beam_python_mongoio_load_test"
job(jobName) {
common.setTopLevelMainJobProperties(delegate)
common.setAutoJob(delegate, 'H H/6 * * *')
- // [Issue#21824] Disable trigger
- // common.enablePhraseTriggeringFromPullRequest(
- // delegate,
- // 'Python MongoDBIO Load Test',
- // 'Run Python MongoDBIO Load Test')
+ common.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'Python MongoDBIO Load Test',
+ 'Run Python MongoDBIO Load Test')
String namespace = common.getKubernetesNamespace(jobName)
String kubeconfigPath = common.getKubeconfigLocationForNamespace(namespace)