This is an automated email from the ASF dual-hosted git repository. ibzib 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 d856f28 [BEAM-14225] load balance jenkins jobs new 3d4454c Merge pull request #17238 from ibzib/BEAM-14225 d856f28 is described below commit d856f280e10d744a9e61a9fb2c5422470d638103 Author: Kyle Weaver <kcwea...@google.com> AuthorDate: Thu Mar 31 16:49:15 2022 -0700 [BEAM-14225] load balance jenkins jobs --- .test-infra/jenkins/CommonJobProperties.groovy | 2 +- .test-infra/jenkins/CronJobBuilder.groovy | 2 +- .test-infra/jenkins/PostcommitJobBuilder.groovy | 2 +- .test-infra/jenkins/job_00_seed.groovy | 4 ++-- .test-infra/jenkins/job_Dependency_Check.groovy | 3 +-- .test-infra/jenkins/job_LoadTests_FnApiRunner_Python.groovy | 2 +- .test-infra/jenkins/job_Metrics_Report.groovy | 3 +-- .test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy | 4 ++-- .test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_JDBC.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_Python.groovy | 2 +- .test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy | 2 +- .test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy | 2 +- .test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy | 2 +- .test-infra/jenkins/job_Publish_Docker_Snapshots.groovy | 2 +- .test-infra/jenkins/job_Release_NightlySnapshot.groovy | 2 +- .test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy | 2 +- 21 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.test-infra/jenkins/CommonJobProperties.groovy b/.test-infra/jenkins/CommonJobProperties.groovy index b0dc45f..a715e0e 100644 --- a/.test-infra/jenkins/CommonJobProperties.groovy +++ b/.test-infra/jenkins/CommonJobProperties.groovy @@ -219,7 +219,7 @@ class CommonJobProperties { // Sets common config for jobs which run on a schedule; optionally on push static void setAutoJob(context, - String buildSchedule = '0 */6 * * *', + String buildSchedule = 'H H/6 * * *', notifyAddress = 'bui...@beam.apache.org', triggerOnCommit = false, emailIndividuals = false) { diff --git a/.test-infra/jenkins/CronJobBuilder.groovy b/.test-infra/jenkins/CronJobBuilder.groovy index fc4be04..100cc55 100644 --- a/.test-infra/jenkins/CronJobBuilder.groovy +++ b/.test-infra/jenkins/CronJobBuilder.groovy @@ -37,7 +37,7 @@ class CronJobBuilder { * @param cronPattern Defines when the job should be fired. Default: "every 6th hour". * @param jobDefinition Closure for the job. */ - static void cronJob(nameBase, cronPattern = '0 */6 * * *', scope, jobDefinition = {}) { + static void cronJob(nameBase, cronPattern = 'H H/6 * * *', scope, jobDefinition = {}) { CronJobBuilder builder = new CronJobBuilder(scope, jobDefinition) builder.defineAutoPostCommitJob(nameBase, cronPattern) } diff --git a/.test-infra/jenkins/PostcommitJobBuilder.groovy b/.test-infra/jenkins/PostcommitJobBuilder.groovy index ca1a70c..70d3759 100644 --- a/.test-infra/jenkins/PostcommitJobBuilder.groovy +++ b/.test-infra/jenkins/PostcommitJobBuilder.groovy @@ -58,7 +58,7 @@ class PostcommitJobBuilder { void defineAutoPostCommitJob(name) { def autoBuilds = scope.job(name) { - commonJobProperties.setAutoJob delegate, '0 */6 * * *', 'bui...@beam.apache.org', true, true + commonJobProperties.setAutoJob delegate, 'H H/6 * * *', 'bui...@beam.apache.org', true, true } autoBuilds.with(jobDefinition) diff --git a/.test-infra/jenkins/job_00_seed.groovy b/.test-infra/jenkins/job_00_seed.groovy index 820f3c4..2ffac70 100644 --- a/.test-infra/jenkins/job_00_seed.groovy +++ b/.test-infra/jenkins/job_00_seed.groovy @@ -73,8 +73,8 @@ job('beam_SeedJob') { } triggers { - // Run once per day - cron('H */6 * * *') + // Run every six hours + cron('H H/6 * * *') githubPullRequest { admins(['asfbot']) diff --git a/.test-infra/jenkins/job_Dependency_Check.groovy b/.test-infra/jenkins/job_Dependency_Check.groovy index f97e0bb..b34723e 100644 --- a/.test-infra/jenkins/job_Dependency_Check.groovy +++ b/.test-infra/jenkins/job_Dependency_Check.groovy @@ -33,10 +33,9 @@ job('beam_Dependency_Check') { false ) - // This is a job that runs weekly. commonJobProperties.setAutoJob( delegate, - '0 12 * * 1') + '@weekly') steps { gradle { diff --git a/.test-infra/jenkins/job_LoadTests_FnApiRunner_Python.groovy b/.test-infra/jenkins/job_LoadTests_FnApiRunner_Python.groovy index befc04a..538ef2b 100644 --- a/.test-infra/jenkins/job_LoadTests_FnApiRunner_Python.groovy +++ b/.test-infra/jenkins/job_LoadTests_FnApiRunner_Python.groovy @@ -64,7 +64,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob( // Run this job every 6 hours on a random minute. -CronJobBuilder.cronJob('beam_Python_LoadTests_FnApiRunner_Microbenchmark', 'H */6 * * *', this) { +CronJobBuilder.cronJob('beam_Python_LoadTests_FnApiRunner_Microbenchmark', 'H H/6 * * *', this) { additionalPipelineArgs = [ influx_db_name: InfluxDBCredentialsHelper.InfluxDBDatabaseName, influx_hostname: InfluxDBCredentialsHelper.InfluxDBHostUrl, diff --git a/.test-infra/jenkins/job_Metrics_Report.groovy b/.test-infra/jenkins/job_Metrics_Report.groovy index 2298ce6..d1d3582 100644 --- a/.test-infra/jenkins/job_Metrics_Report.groovy +++ b/.test-infra/jenkins/job_Metrics_Report.groovy @@ -39,10 +39,9 @@ job('beam_Metrics_Report') { false ) - // This is a job that runs weekly. commonJobProperties.setAutoJob( delegate, - '0 12 * * 1') + '@weekly') steps { gradle { diff --git a/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy b/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy index 4cf70c9..1d8ce84 100644 --- a/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_BigQueryIO_Java.groovy @@ -119,7 +119,7 @@ private void createPostCommitJob(jobConfig) { description(jobConfig.description) common.setTopLevelMainJobProperties(delegate) common.enablePhraseTriggeringFromPullRequest(delegate, jobConfig.title, jobConfig.triggerPhrase) - common.setAutoJob(delegate, 'H */6 * * *') + 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 c69e039..df9728b 100644 --- a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy @@ -287,7 +287,7 @@ private void createGCSFileBasedIOITTestJob(testJob) { description(testJob.description) common.setTopLevelMainJobProperties(delegate) common.enablePhraseTriggeringFromPullRequest(delegate, testJob.githubTitle, testJob.githubTriggerPhrase) - common.setAutoJob(delegate, 'H */6 * * *') + common.setAutoJob(delegate, 'H H/6 * * *') InfluxDBCredentialsHelper.useCredentials(delegate) additionalPipelineArgs = [ influxDatabase: InfluxDBCredentialsHelper.InfluxDBDatabaseName, @@ -340,7 +340,7 @@ private void createHDFSFileBasedIOITTestJob(testJob) { description(testJob.description) common.setTopLevelMainJobProperties(delegate) common.enablePhraseTriggeringFromPullRequest(delegate, testJob.githubTitle, testJob.githubTriggerPhrase) - common.setAutoJob(delegate, 'H */6 * * *') + common.setAutoJob(delegate, 'H H/6 * * *') InfluxDBCredentialsHelper.useCredentials(delegate) additionalPipelineArgs = [ influxDatabase: InfluxDBCredentialsHelper.InfluxDBDatabaseName, diff --git a/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy b/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy index ffe7967..73fde9f 100644 --- a/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_HadoopFormat.groovy @@ -24,7 +24,7 @@ String jobName = "beam_PerformanceTests_HadoopFormat" job(jobName) { common.setTopLevelMainJobProperties(delegate) - common.setAutoJob(delegate, 'H */6 * * *') + common.setAutoJob(delegate, 'H H/6 * * *') common.enablePhraseTriggeringFromPullRequest( delegate, 'Java HadoopFormatIO Performance Test', diff --git a/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy index 28b3d34..83cd2af 100644 --- a/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_InfluxDBIO_IT.groovy @@ -22,7 +22,7 @@ String jobName = "beam_PerformanceTests_InfluxDbIO_IT" job(jobName) { common.setTopLevelMainJobProperties(delegate) - common.setAutoJob(delegate,'H */6 * * *') + common.setAutoJob(delegate,'H H/6 * * *') common.enablePhraseTriggeringFromPullRequest( delegate, 'Java InfluxDbIO Performance Test', diff --git a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy index 13b4e23..f41f4ad 100644 --- a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy @@ -24,7 +24,7 @@ String jobName = "beam_PerformanceTests_JDBC" job(jobName) { common.setTopLevelMainJobProperties(delegate) - common.setAutoJob(delegate, 'H */6 * * *') + common.setAutoJob(delegate, 'H H/6 * * *') common.enablePhraseTriggeringFromPullRequest( delegate, 'Java JdbcIO Performance Test', diff --git a/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy index 4c665a3..f87617d 100644 --- a/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_KafkaIO_IT.groovy @@ -25,7 +25,7 @@ String jobName = "beam_PerformanceTests_Kafka_IO" job(jobName) { common.setTopLevelMainJobProperties(delegate) // TODO(BEAM-9482): Re-enable once fixed. - // common.setAutoJob(delegate, 'H */6 * * *') + // common.setAutoJob(delegate, 'H H/6 * * *') common.enablePhraseTriggeringFromPullRequest( delegate, 'Java KafkaIO Performance Test', diff --git a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy index 3a5b1b2..c9bc59e 100644 --- a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy @@ -24,7 +24,7 @@ String jobName = "beam_PerformanceTests_MongoDBIO_IT" job(jobName) { common.setTopLevelMainJobProperties(delegate) - common.setAutoJob(delegate,'H */6 * * *') + common.setAutoJob(delegate,'H H/6 * * *') common.enablePhraseTriggeringFromPullRequest( delegate, 'Java MongoDBIO Performance Test', diff --git a/.test-infra/jenkins/job_PerformanceTests_Python.groovy b/.test-infra/jenkins/job_PerformanceTests_Python.groovy index 0807d2d..282f2db 100644 --- a/.test-infra/jenkins/job_PerformanceTests_Python.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_Python.groovy @@ -70,7 +70,7 @@ private void createPythonPerformanceTestJob(Map testConfig) { InfluxDBCredentialsHelper.useCredentials(delegate) // Run job in postcommit, don't trigger every push. - commonJobProperties.setAutoJob(delegate, 'H */6 * * *') + commonJobProperties.setAutoJob(delegate, 'H H/6 * * *') // Allows triggering this build against pull requests. commonJobProperties.enablePhraseTriggeringFromPullRequest( diff --git a/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy b/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy index 2207c46..3fffe39 100644 --- a/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy +++ b/.test-infra/jenkins/job_PerformanceTests_SQLIO_Java.groovy @@ -44,7 +44,7 @@ private void createPostCommitJob(jobConfig) { description(jobConfig.description) common.setTopLevelMainJobProperties(delegate) common.enablePhraseTriggeringFromPullRequest(delegate, jobConfig.title, jobConfig.triggerPhrase) - common.setAutoJob(delegate, 'H */6 * * *') + common.setAutoJob(delegate, 'H H/6 * * *') publishers { archiveJunit('**/build/test-results/**/*.xml') } 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 78c285e..2e13da5 100644 --- a/.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy +++ b/.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy @@ -22,7 +22,7 @@ String jobName = "beam_python_mongoio_load_test" job(jobName) { common.setTopLevelMainJobProperties(delegate) - common.setAutoJob(delegate, 'H */6 * * *') + common.setAutoJob(delegate, 'H H/6 * * *') common.enablePhraseTriggeringFromPullRequest( delegate, 'Python MongoDBIO Load Test', diff --git a/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy b/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy index d31c354..4529015 100644 --- a/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy +++ b/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy @@ -38,7 +38,7 @@ job('beam_PostRelease_NightlySnapshot') { // This is a post-commit job that runs once per day, not for every push. commonJobProperties.setAutoJob( delegate, - '0 11 * * *') + '@daily') // Allows triggering this build against pull requests. diff --git a/.test-infra/jenkins/job_Publish_Docker_Snapshots.groovy b/.test-infra/jenkins/job_Publish_Docker_Snapshots.groovy index 256ee5a..ec6b91d 100644 --- a/.test-infra/jenkins/job_Publish_Docker_Snapshots.groovy +++ b/.test-infra/jenkins/job_Publish_Docker_Snapshots.groovy @@ -35,7 +35,7 @@ job('beam_Publish_Docker_Snapshots') { ) // Runs once per day. - commonJobProperties.setAutoJob(delegate, 'H 10 * * *') + commonJobProperties.setAutoJob(delegate, '@daily') steps { gradle { diff --git a/.test-infra/jenkins/job_Release_NightlySnapshot.groovy b/.test-infra/jenkins/job_Release_NightlySnapshot.groovy index 06bb222..74429c7 100644 --- a/.test-infra/jenkins/job_Release_NightlySnapshot.groovy +++ b/.test-infra/jenkins/job_Release_NightlySnapshot.groovy @@ -33,7 +33,7 @@ job('beam_Release_NightlySnapshot') { // This is a post-commit job that runs once per day, not for every push. commonJobProperties.setAutoJob( delegate, - '0 7 * * *', + '@daily', 'bui...@beam.apache.org') diff --git a/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy b/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy index b332e76..19e84d1 100644 --- a/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy +++ b/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy @@ -31,7 +31,7 @@ job('beam_Release_Python_NightlySnapshot') { // This is a post-commit job that runs once per day, not for every push. commonJobProperties.setAutoJob( delegate, - '0 7 * * *', + '@daily', 'bui...@beam.apache.org') // Allows triggering this build against pull requests.