[
https://issues.apache.org/jira/browse/BEAM-4691?focusedWorklogId=121958&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-121958
]
ASF GitHub Bot logged work on BEAM-4691:
----------------------------------------
Author: ASF GitHub Bot
Created on: 11/Jul/18 17:14
Start Date: 11/Jul/18 17:14
Worklog Time Spent: 10m
Work Description: lukecwik closed pull request #5927: [BEAM-4691] Rename
common_job_properties
URL: https://github.com/apache/beam/pull/5927
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/CommonJobProperties.groovy
similarity index 98%
rename from .test-infra/jenkins/common_job_properties.groovy
rename to .test-infra/jenkins/CommonJobProperties.groovy
index 81ec59bee18..42af9c1898a 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/CommonJobProperties.groovy
@@ -20,7 +20,7 @@
// common properties that are shared among all Jenkins projects.
// Code in this directory should conform to the Groovy style guide.
// http://groovy-lang.org/style-guide.html
-class common_job_properties {
+class CommonJobProperties {
static String checkoutDir = 'src'
@@ -323,7 +323,7 @@ class common_job_properties {
// Install Perfkit benchmark requirements.
shell('.env/bin/pip install -r PerfKitBenchmarker/requirements.txt')
// Install job requirements for Python SDK.
- shell('.env/bin/pip install -e ' + common_job_properties.checkoutDir +
'/sdks/python/[gcp,test]')
+ shell('.env/bin/pip install -e ' + CommonJobProperties.checkoutDir +
'/sdks/python/[gcp,test]')
// Launch performance test.
shell(".env/bin/python PerfKitBenchmarker/pkb.py $pkbArgs")
}
diff --git a/.test-infra/jenkins/PostcommitJobBuilder.groovy
b/.test-infra/jenkins/PostcommitJobBuilder.groovy
index ce41d265353..9ca88bca7fb 100644
--- a/.test-infra/jenkins/PostcommitJobBuilder.groovy
+++ b/.test-infra/jenkins/PostcommitJobBuilder.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties as cjp
+import CommonJobProperties as commonJobProperties
/**
* This class is to be used for defining jobs for post- and pre-commit tests.
@@ -47,14 +47,14 @@ class PostcommitJobBuilder {
void defineAutoPostCommitJob(name) {
def autoBuilds = scope.job(name) {
- cjp.setAutoJob delegate
+ commonJobProperties.setAutoJob delegate
}
autoBuilds.with(jobDefinition)
}
private void defineGhprbTriggeredJob(name, triggerPhrase, githubUiHint,
triggerOnPrCommit) {
def ghprbBuilds = scope.job(name) {
- cjp.setPullRequestBuildTrigger(
+ commonJobProperties.setPullRequestBuildTrigger(
delegate,
githubUiHint,
triggerPhrase,
diff --git a/.test-infra/jenkins/PrecommitJobBuilder.groovy
b/.test-infra/jenkins/PrecommitJobBuilder.groovy
index cd4250e33e6..a7b3ad26f2d 100644
--- a/.test-infra/jenkins/PrecommitJobBuilder.groovy
+++ b/.test-infra/jenkins/PrecommitJobBuilder.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
/** This class defines PrecommitJobBuilder.build() helper for defining
pre-comit jobs. */
class PrecommitJobBuilder {
@@ -51,7 +51,7 @@ class PrecommitJobBuilder {
def job = createBaseJob 'Cron'
job.with {
description buildDescription('on a daily schedule.')
- common_job_properties.setAutoJob delegate
+ commonJobProperties.setAutoJob delegate
}
job.with additionalCustomization
}
@@ -71,7 +71,7 @@ class PrecommitJobBuilder {
job.with {
description buildDescription('for each commit push.')
concurrentBuild()
- common_job_properties.setPullRequestBuildTrigger(delegate,
+ commonJobProperties.setPullRequestBuildTrigger(delegate,
githubUiHint(),
'',
false,
@@ -85,7 +85,7 @@ class PrecommitJobBuilder {
job.with {
description buildDescription("on trigger phrase
'${buildTriggerPhrase()}'.")
concurrentBuild()
- common_job_properties.setPullRequestBuildTrigger delegate,
githubUiHint(), buildTriggerPhrase()
+ commonJobProperties.setPullRequestBuildTrigger delegate, githubUiHint(),
buildTriggerPhrase()
}
job.with additionalCustomization
}
@@ -93,15 +93,15 @@ class PrecommitJobBuilder {
private Object createBaseJob(nameSuffix, usesRegionFilter = false) {
def allowRemotePoll = !usesRegionFilter
return scope.job("beam_PreCommit_${nameBase}_${nameSuffix}") {
- common_job_properties.setTopLevelMainJobProperties(delegate,
+ commonJobProperties.setTopLevelMainJobProperties(delegate,
'master',
timeoutMins,
allowRemotePoll) // needed for included regions PR triggering; see
[JENKINS-23606]
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(gradleTask)
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git a/.test-infra/jenkins/job_Dependency_Check.groovy
b/.test-infra/jenkins/job_Dependency_Check.groovy
index 6f3e1063347..06041de0c93 100644
--- a/.test-infra/jenkins/job_Dependency_Check.groovy
+++ b/.test-infra/jenkins/job_Dependency_Check.groovy
@@ -16,34 +16,34 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
job('beam_Dependency_Check') {
description('Runs Beam dependency check.')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Beam Dependency Check',
'Run Dependency Check')
// This is a job that runs weekly.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'0 12 * * 1')
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':runBeamDependencyCheck')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Drevision=release')
}
- shell('cd ' + common_job_properties.checkoutDir +
+ shell('cd ' + commonJobProperties.checkoutDir +
' && bash .test-infra/jenkins/dependency_check/generate_report.sh')
}
diff --git a/.test-infra/jenkins/job_Inventory.groovy
b/.test-infra/jenkins/job_Inventory.groovy
index 8ec6ca059b8..aee120e977d 100644
--- a/.test-infra/jenkins/job_Inventory.groovy
+++ b/.test-infra/jenkins/job_Inventory.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// These jobs list details about each beam runner, to clarify what software
// is on each machine.
@@ -27,13 +27,13 @@ nums.each {
description("Run inventory on ${machine}")
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Sets that this is a cron job.
- common_job_properties.setCronJob(delegate, '45 18 * * *')
+ commonJobProperties.setCronJob(delegate, '45 18 * * *')
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Machine Inventory',
"Run Inventory ${machine}")
diff --git a/.test-infra/jenkins/job_PerformanceTests_Dataflow.groovy
b/.test-infra/jenkins/job_PerformanceTests_Dataflow.groovy
index 83af00686b4..6af1723f217 100644
--- a/.test-infra/jenkins/job_PerformanceTests_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_Dataflow.groovy
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// This job runs the Beam performance tests on PerfKit Benchmarker.
job('beam_PerformanceTests_Dataflow'){
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
@@ -36,7 +36,7 @@ job('beam_PerformanceTests_Dataflow'){
config_override:
'dpb_wordcount_benchmark.dpb_service.service_type=dataflow'
]
- common_job_properties.buildPerformanceTest(delegate, argMap)
+ commonJobProperties.buildPerformanceTest(delegate, argMap)
// [BEAM-2141] Perf tests do not pass.
disabled()
diff --git a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
index d009cd1b231..b7952e5d983 100644
--- a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
def testsConfigurations = [
[
@@ -102,17 +102,17 @@ private void
create_filebasedio_performance_test_job(testConfiguration) {
description(testConfiguration.jobDescription)
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
testConfiguration.prCommitStatusName,
testConfiguration.prTriggerPhase)
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
@@ -132,10 +132,10 @@ private void
create_filebasedio_performance_test_job(testConfiguration) {
beam_sdk : 'java',
beam_it_module : 'sdks/java/io/file-based-io-tests',
beam_it_class : testConfiguration.itClass,
- beam_it_options :
common_job_properties.joinPipelineOptions(pipelineOptions),
+ beam_it_options :
commonJobProperties.joinPipelineOptions(pipelineOptions),
beam_extra_properties: '["filesystem=gcs"]',
bigquery_table : testConfiguration.bqTable,
]
- common_job_properties.buildPerformanceTest(delegate, argMap)
+ commonJobProperties.buildPerformanceTest(delegate, argMap)
}
}
diff --git
a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
index 34f7f7367ef..cac06a2115f 100644
--- a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
def testsConfigurations = [
[
@@ -104,17 +104,17 @@ private void
create_filebasedio_performance_test_job(testConfiguration) {
description(testConfiguration.jobDescription)
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
testConfiguration.prCommitStatusName,
testConfiguration.prTriggerPhase)
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
@@ -132,8 +132,8 @@ private void
create_filebasedio_performance_test_job(testConfiguration) {
})
def pipelineArgsJoined = "[" + pipelineArgList.join(',') + "]"
- String namespace =
common_job_properties.getKubernetesNamespace(testConfiguration.jobName)
- String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
+ String namespace =
commonJobProperties.getKubernetesNamespace(testConfiguration.jobName)
+ String kubeconfig =
commonJobProperties.getKubeconfigLocationForNamespace(namespace)
def argMap = [
kubeconfig : kubeconfig,
@@ -149,9 +149,9 @@ private void
create_filebasedio_performance_test_job(testConfiguration) {
beam_options_config_file: makePathAbsolute('pkb-config.yml'),
beam_kubernetes_scripts :
makePathAbsolute('hdfs-multi-datanode-cluster.yml')
]
- common_job_properties.setupKubernetes(delegate, namespace, kubeconfig)
- common_job_properties.buildPerformanceTest(delegate, argMap)
- common_job_properties.cleanupKubernetes(delegate, namespace,
kubeconfig)
+ commonJobProperties.setupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.buildPerformanceTest(delegate, argMap)
+ commonJobProperties.cleanupKubernetes(delegate, namespace, kubeconfig)
}
}
diff --git a/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
b/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
index 16ae4f005c6..888422347ca 100644
--- a/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
@@ -16,21 +16,21 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
String jobName = "beam_PerformanceTests_HadoopInputFormat"
job(jobName) {
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Java HadoopInputFormatIO Performance Test',
'Run Java HadoopInputFormatIO Performance Test')
@@ -42,8 +42,8 @@ job(jobName) {
numberOfRecords: '600000'
]
- String namespace = common_job_properties.getKubernetesNamespace(jobName)
- String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
+ String namespace = commonJobProperties.getKubernetesNamespace(jobName)
+ String kubeconfig =
commonJobProperties.getKubeconfigLocationForNamespace(namespace)
def testArgs = [
kubeconfig : kubeconfig,
@@ -53,14 +53,14 @@ job(jobName) {
beam_sdk : 'java',
beam_it_module : 'sdks/java/io/hadoop-input-format',
beam_it_class :
'org.apache.beam.sdk.io.hadoop.inputformat.HadoopInputFormatIOIT',
- beam_it_options :
common_job_properties.joinPipelineOptions(pipelineOptions),
- beam_kubernetes_scripts :
common_job_properties.makePathAbsolute('src/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml'),
- beam_options_config_file:
common_job_properties.makePathAbsolute('src/.test-infra/kubernetes/postgres/pkb-config-local.yml'),
+ beam_it_options :
commonJobProperties.joinPipelineOptions(pipelineOptions),
+ beam_kubernetes_scripts :
commonJobProperties.makePathAbsolute('src/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml'),
+ beam_options_config_file:
commonJobProperties.makePathAbsolute('src/.test-infra/kubernetes/postgres/pkb-config-local.yml'),
bigquery_table :
'beam_performance.hadoopinputformatioit_pkb_results'
]
- common_job_properties.setupKubernetes(delegate, namespace, kubeconfig)
- common_job_properties.buildPerformanceTest(delegate, testArgs)
- common_job_properties.cleanupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.setupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.buildPerformanceTest(delegate, testArgs)
+ commonJobProperties.cleanupKubernetes(delegate, namespace, kubeconfig)
}
diff --git a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
index 723ad51007b..1e5d6b0f6f7 100644
--- a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
@@ -16,21 +16,21 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
String jobName = "beam_PerformanceTests_JDBC"
job(jobName) {
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Java JdbcIO Performance Test',
'Run Java JdbcIO Performance Test')
@@ -42,8 +42,8 @@ job(jobName) {
numberOfRecords: '5000000'
]
- String namespace = common_job_properties.getKubernetesNamespace(jobName)
- String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
+ String namespace = commonJobProperties.getKubernetesNamespace(jobName)
+ String kubeconfig =
commonJobProperties.getKubeconfigLocationForNamespace(namespace)
def testArgs = [
kubeconfig : kubeconfig,
@@ -53,14 +53,14 @@ job(jobName) {
beam_sdk : 'java',
beam_it_module : 'sdks/java/io/jdbc',
beam_it_class : 'org.apache.beam.sdk.io.jdbc.JdbcIOIT',
- beam_it_options :
common_job_properties.joinPipelineOptions(pipelineOptions),
- beam_kubernetes_scripts :
common_job_properties.makePathAbsolute('src/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml'),
- beam_options_config_file:
common_job_properties.makePathAbsolute('src/.test-infra/kubernetes/postgres/pkb-config-local.yml'),
+ beam_it_options :
commonJobProperties.joinPipelineOptions(pipelineOptions),
+ beam_kubernetes_scripts :
commonJobProperties.makePathAbsolute('src/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml'),
+ beam_options_config_file:
commonJobProperties.makePathAbsolute('src/.test-infra/kubernetes/postgres/pkb-config-local.yml'),
bigquery_table : 'beam_performance.jdbcioit_pkb_results'
]
- common_job_properties.setupKubernetes(delegate, namespace, kubeconfig)
- common_job_properties.buildPerformanceTest(delegate, testArgs)
- common_job_properties.cleanupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.setupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.buildPerformanceTest(delegate, testArgs)
+ commonJobProperties.cleanupKubernetes(delegate, namespace, kubeconfig)
}
diff --git a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
index c5191bb3424..d6089faaedc 100644
--- a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
@@ -16,21 +16,21 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
String jobName = "beam_PerformanceTests_MongoDBIO_IT"
job(jobName) {
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Java MongoDBIO Performance Test',
'Run Java MongoDBIO Performance Test')
@@ -41,8 +41,8 @@ job(jobName) {
numberOfRecords: '10000000'
]
- String namespace = common_job_properties.getKubernetesNamespace(jobName)
- String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
+ String namespace = commonJobProperties.getKubernetesNamespace(jobName)
+ String kubeconfig =
commonJobProperties.getKubeconfigLocationForNamespace(namespace)
def testArgs = [
kubeconfig : kubeconfig,
@@ -52,13 +52,13 @@ job(jobName) {
beam_sdk : 'java',
beam_it_module : 'sdks/java/io/mongodb',
beam_it_class :
'org.apache.beam.sdk.io.mongodb.MongoDBIOIT',
- beam_it_options :
common_job_properties.joinPipelineOptions(pipelineOptions),
- beam_kubernetes_scripts :
common_job_properties.makePathAbsolute('src/.test-infra/kubernetes/mongodb/load-balancer/mongo.yml'),
- beam_options_config_file:
common_job_properties.makePathAbsolute('src/.test-infra/kubernetes/mongodb/load-balancer/pkb-config.yml'),
+ beam_it_options :
commonJobProperties.joinPipelineOptions(pipelineOptions),
+ beam_kubernetes_scripts :
commonJobProperties.makePathAbsolute('src/.test-infra/kubernetes/mongodb/load-balancer/mongo.yml'),
+ beam_options_config_file:
commonJobProperties.makePathAbsolute('src/.test-infra/kubernetes/mongodb/load-balancer/pkb-config.yml'),
bigquery_table :
'beam_performance.mongodbioit_pkb_results'
]
- common_job_properties.setupKubernetes(delegate, namespace, kubeconfig)
- common_job_properties.buildPerformanceTest(delegate, testArgs)
- common_job_properties.cleanupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.setupKubernetes(delegate, namespace, kubeconfig)
+ commonJobProperties.buildPerformanceTest(delegate, testArgs)
+ commonJobProperties.cleanupKubernetes(delegate, namespace, kubeconfig)
}
diff --git a/.test-infra/jenkins/job_PerformanceTests_Python.groovy
b/.test-infra/jenkins/job_PerformanceTests_Python.groovy
index b7de70bd28e..e9591fb6907 100644
--- a/.test-infra/jenkins/job_PerformanceTests_Python.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_Python.groovy
@@ -16,20 +16,20 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// This job runs the Beam Python performance tests on PerfKit Benchmarker.
job('beam_PerformanceTests_Python'){
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Run job in postcommit every 6 hours, don't trigger every push.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Python SDK Performance Test',
'Run Python Performance Test')
@@ -52,7 +52,7 @@ job('beam_PerformanceTests_Python'){
beam_it_args: pipelineArgsJoined
]
- common_job_properties.buildPerformanceTest(delegate, argMap)
+ commonJobProperties.buildPerformanceTest(delegate, argMap)
// [BEAM-3809] Python performance tests are failing.
disabled()
diff --git a/.test-infra/jenkins/job_PerformanceTests_Spark.groovy
b/.test-infra/jenkins/job_PerformanceTests_Spark.groovy
index 45751e5f0be..c7bb48321a1 100644
--- a/.test-infra/jenkins/job_PerformanceTests_Spark.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_Spark.groovy
@@ -16,20 +16,20 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// This job runs the Beam performance tests on PerfKit Benchmarker.
job('beam_PerformanceTests_Spark'){
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Spark Performance Test',
'Run Spark Performance Test')
// Run job in postcommit every 6 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'H */6 * * *')
@@ -42,5 +42,5 @@ job('beam_PerformanceTests_Spark'){
bigquery_table: 'beam_performance.spark_pkp_results'
]
- common_job_properties.buildPerformanceTest(delegate, argMap)
+ commonJobProperties.buildPerformanceTest(delegate, argMap)
}
diff --git a/.test-infra/jenkins/job_PostCommit_Go_GradleBuild.groovy
b/.test-infra/jenkins/job_PostCommit_Go_GradleBuild.groovy
index f7629554b77..386eb1df731 100644
--- a/.test-infra/jenkins/job_PostCommit_Go_GradleBuild.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Go_GradleBuild.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
@@ -30,16 +30,16 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Go_GradleBuild', 'Run Go Pos
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(
+ commonJobProperties.setTopLevelMainJobProperties(
delegate,
'master',
150)
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':goPostCommit')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_GradleBuild.groovy
b/.test-infra/jenkins/job_PostCommit_Java_GradleBuild.groovy
index f0b88e2f2cb..e4d863066bd 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_GradleBuild.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_GradleBuild.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
@@ -31,7 +31,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_GradleBuild', 'Run Java
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 240)
+ commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
// Publish all test results to Jenkins
publishers {
@@ -41,9 +41,9 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_GradleBuild', 'Run Java
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':javaPostCommit')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
// Specify maven home on Jenkins, needed by Maven archetype integration
tests.
switches('-Pmaven_home=/home/jenkins/tools/maven/apache-maven-3.5.2')
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
index cb1e1177d14..70e5bc6b47c 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import NexmarkBigqueryProperties
import NoPhraseTriggeringPostCommitBuilder
@@ -29,15 +29,15 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 240)
+ commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
// Gradle goals for this job.
steps {
shell('echo *** RUN NEXMARK IN BATCH MODE USING DIRECT RUNNER ***')
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-sdks-java-nexmark:run')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Pnexmark.runner=":beam-runners-direct-java"' +
' -Pnexmark.args="' +
[NexmarkBigqueryProperties.nexmarkBigQueryArgs,
@@ -51,9 +51,9 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
}
shell('echo *** RUN NEXMARK IN STREAMING MODE USING DIRECT RUNNER ***')
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-sdks-java-nexmark:run')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Pnexmark.runner=":beam-runners-direct-java"' +
' -Pnexmark.args="' +
[NexmarkBigqueryProperties.nexmarkBigQueryArgs,
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
index 4aad246e0ee..40c3f0e8f68 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import NexmarkBigqueryProperties
import NoPhraseTriggeringPostCommitBuilder
@@ -29,15 +29,15 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 240)
+ commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
// Gradle goals for this job.
steps {
shell('echo *** RUN NEXMARK IN BATCH MODE USING FLINK RUNNER ***')
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-sdks-java-nexmark:run')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Pnexmark.runner=":beam-runners-flink_2.11"' +
' -Pnexmark.args="' +
[NexmarkBigqueryProperties.nexmarkBigQueryArgs,
@@ -51,9 +51,9 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
}
shell('echo *** RUN NEXMARK IN STREAMING MODE USING FLINK RUNNER ***')
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-sdks-java-nexmark:run')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Pnexmark.runner=":beam-runners-flink_2.11"' +
' -Pnexmark.args="' +
[NexmarkBigqueryProperties.nexmarkBigQueryArgs,
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
index 6043b7bc973..b27e00a3fc4 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import NexmarkBigqueryProperties
import NoPhraseTriggeringPostCommitBuilder
@@ -29,15 +29,15 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 240)
+ commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
// Gradle goals for this job.
steps {
shell('echo *** RUN NEXMARK IN BATCH MODE USING SPARK RUNNER ***')
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-sdks-java-nexmark:run')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Pnexmark.runner=":beam-runners-spark"' +
' -Pnexmark.args="' +
[NexmarkBigqueryProperties.nexmarkBigQueryArgs,
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy
b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy
index ca439667912..4dbe5e4bfb2 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of ValidatesRunner tests against the Apex runner.
@@ -27,7 +27,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Apex_Gr
previousNames('beam_PostCommit_Java_RunnableOnService_Apex')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Publish all test results to Jenkins
publishers {
@@ -37,9 +37,9 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Apex_Gr
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-runners-apex:validatesRunner')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
index d721a9f4bd8..8d30962a9f9 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
@@ -36,7 +36,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Dataflo
}
// Set common parameters. Sets a 3 hour timeout.
- common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 180)
+ commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 300)
// Publish all test results to Jenkins
publishers {
@@ -46,14 +46,14 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Dataflo
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-runners-google-cloud-dataflow-java:validatesRunner')
// Increase parallel worker threads above processor limit since most
time is
// spent waiting on Dataflow jobs. ValidatesRunner tests on Dataflow are
slow
// because each one launches a Dataflow job with about 3 mins of
overhead.
// 3 x num_cores strikes a good balance between maxing out parallelism
without
// overloading the machines.
- common_job_properties.setGradleSwitches(delegate, 3 *
Runtime.runtime.availableProcessors())
+ commonJobProperties.setGradleSwitches(delegate, 3 *
Runtime.runtime.availableProcessors())
}
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy
b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy
index ce21694f785..efb6c3d161c 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of ValidatesRunner tests against the Flink runner.
@@ -25,7 +25,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Flink_G
description('Runs the ValidatesRunner suite on the Flink runner.')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Publish all test results to Jenkins
publishers {
@@ -35,9 +35,9 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Flink_G
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-runners-flink_2.11:validatesRunner')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy
b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy
index 9ea2281e078..e748849b10e 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of ValidatesRunner tests against the Gearpump
@@ -29,7 +29,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Gearpum
previousNames('beam_PostCommit_Java_RunnableOnService_Gearpump')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(
+ commonJobProperties.setTopLevelMainJobProperties(
delegate,
'master')
@@ -41,9 +41,9 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Gearpum
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-runners-gearpump:validatesRunner')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy
b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy
index 16e3d1f69e4..96a2eccb992 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of ValidatesRunner tests against the Samza runner.
@@ -25,7 +25,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Samza_G
description('Runs the ValidatesRunner suite on the Samza runner.')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Publish all test results to Jenkins
publishers {
@@ -35,9 +35,9 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Samza_G
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-runners-samza:validatesRunner')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy
b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy
index 5d0e756a644..8bdf3f5fcdd 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of ValidatesRunner tests against the Spark runner.
@@ -27,7 +27,7 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Spark_G
previousNames('beam_PostCommit_Java_RunnableOnService_Spark')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 120)
+ commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 120)
// Publish all test results to Jenkins
publishers {
@@ -37,9 +37,9 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Spark_G
// Gradle goals for this job.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-runners-spark:validatesRunner')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
b/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
index 653b6ccede9..5a0a644c2e5 100644
---
a/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
+++
b/.test-infra/jenkins/job_PostCommit_Python_ValidatesContainer_Dataflow.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of Python ValidatesContainer tests against the
@@ -26,10 +26,10 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Py_ValCont',
description('Runs Python ValidatesContainer suite on the Dataflow runner.')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Execute shell command to test Python SDK.
steps {
- shell('cd ' + common_job_properties.checkoutDir + ' && bash
sdks/python/container/run_validatescontainer.sh')
+ shell('cd ' + commonJobProperties.checkoutDir + ' && bash
sdks/python/container/run_validatescontainer.sh')
}
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Python_ValidatesRunner_Dataflow.groovy
b/.test-infra/jenkins/job_PostCommit_Python_ValidatesRunner_Dataflow.groovy
index 29f497bfa75..6ebda53e867 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_ValidatesRunner_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_ValidatesRunner_Dataflow.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job runs the suite of Python ValidatesRunner tests against the
@@ -26,14 +26,14 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Py_VR_Dataflow', 'Run Python
description('Runs Python ValidatesRunner suite on the Dataflow runner.')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Execute gradle task to test Python SDK.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':beam-sdks-python:validatesRunnerTests')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git a/.test-infra/jenkins/job_PostCommit_Python_Verify.groovy
b/.test-infra/jenkins/job_PostCommit_Python_Verify.groovy
index ea0533f5063..7e2a3f8353c 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Verify.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Verify.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
import PostcommitJobBuilder
// This job defines the Python postcommit tests.
@@ -27,14 +27,14 @@
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Python_Verify', 'Run Python
previousNames('beam_PostCommit_PythonVerify')
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Execute shell command to test Python SDK.
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':pythonPostCommit')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
}
}
}
diff --git a/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy
b/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy
index d7d519a1455..4679229659b 100644
--- a/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy
+++ b/.test-infra/jenkins/job_PostRelease_NightlySnapshot.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// This verifies the nightly snapshot build.
// From https://repository.apache.org/content/groups/snapshots/org/apache/beam.
@@ -27,7 +27,7 @@ job('beam_PostRelease_NightlySnapshot') {
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
parameters {
stringParam('snapshot_version',
@@ -39,13 +39,13 @@ job('beam_PostRelease_NightlySnapshot') {
}
// This is a post-commit job that runs once per day, not for every push.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'0 11 * * *')
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'./gradlew :release:runJavaExamplesValidationTask',
'Run Dataflow PostRelease')
@@ -53,9 +53,9 @@ job('beam_PostRelease_NightlySnapshot') {
steps {
// Run a quickstart from
https://beam.apache.org/get-started/quickstart-java
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':release:runJavaExamplesValidationTask')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
switches('-Pver=$snapshot_version -Prepourl=$snapshot_url')
}
}
diff --git a/.test-infra/jenkins/job_PreCommit_Website_Merge.groovy
b/.test-infra/jenkins/job_PreCommit_Website_Merge.groovy
index 71fa13eb728..235c728bb83 100644
--- a/.test-infra/jenkins/job_PreCommit_Website_Merge.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Website_Merge.groovy
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// Defines a job.
job('beam_PreCommit_Website_Merge') {
description('Runs website tests for mergebot.')
// Set common parameters.
- common_job_properties.setTopLevelWebsiteJobProperties(delegate, 'mergebot')
+ commonJobProperties.setTopLevelWebsiteJobProperties(delegate, 'mergebot')
triggers {
githubPush()
diff --git a/.test-infra/jenkins/job_PreCommit_Website_Stage.groovy
b/.test-infra/jenkins/job_PreCommit_Website_Stage.groovy
index d1a79dac15c..50e1e3e5c4a 100644
--- a/.test-infra/jenkins/job_PreCommit_Website_Stage.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Website_Stage.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// Defines a job.
job('beam_PreCommit_Website_Stage') {
@@ -24,10 +24,10 @@ job('beam_PreCommit_Website_Stage') {
'website to a temporary location to ease reviews.')
// Set common parameters.
- common_job_properties.setTopLevelWebsiteJobProperties(delegate)
+ commonJobProperties.setTopLevelWebsiteJobProperties(delegate)
// Set pull request build trigger.
- common_job_properties.setPreCommit(
+ commonJobProperties.setPreCommit(
delegate,
'Automatic staging of pull requests',
'\nJenkins built the site at commit id ${ghprbActualCommit} with ' +
diff --git a/.test-infra/jenkins/job_PreCommit_Website_Test.groovy
b/.test-infra/jenkins/job_PreCommit_Website_Test.groovy
index dd11871ef02..0500f0f5e05 100644
--- a/.test-infra/jenkins/job_PreCommit_Website_Test.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Website_Test.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// Defines a job.
job('beam_PreCommit_Website_Test') {
@@ -24,7 +24,7 @@ job('beam_PreCommit_Website_Test') {
'website.')
// Set common parameters.
- common_job_properties.setTopLevelWebsiteJobProperties(delegate)
+ commonJobProperties.setTopLevelWebsiteJobProperties(delegate)
// Execute concurrent builds. Multiple builds of this project may be executed
// in parallel. This is safe because this build does not require exclusive
@@ -32,7 +32,7 @@ job('beam_PreCommit_Website_Test') {
concurrentBuild()
// Set pull request build trigger.
- common_job_properties.setPreCommit(
+ commonJobProperties.setPreCommit(
delegate,
'Test website (dead links, etc.)')
diff --git a/.test-infra/jenkins/job_ReleaseCandidate_Python.groovy
b/.test-infra/jenkins/job_ReleaseCandidate_Python.groovy
index 22ed5790645..0102e0b7fb1 100644
--- a/.test-infra/jenkins/job_ReleaseCandidate_Python.groovy
+++ b/.test-infra/jenkins/job_ReleaseCandidate_Python.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
job('beam_PostRelease_Python_Candidate') {
description('Runs verification of the Python release candidate.')
@@ -25,17 +25,17 @@ job('beam_PostRelease_Python_Candidate') {
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'Python SDK Release Candidates Validation',
'Run Python ReleaseCandidate')
// Execute shell command to test Python SDK.
steps {
- shell('cd ' + common_job_properties.checkoutDir +
+ shell('cd ' + commonJobProperties.checkoutDir +
' && bash
release/src/main/groovy/run_release_candidate_python_quickstart.sh' +
' && bash
release/src/main/groovy/run_release_candidate_python_mobile_gaming.sh')
}
diff --git a/.test-infra/jenkins/job_Release_Gradle_NightlySnapshot.groovy
b/.test-infra/jenkins/job_Release_Gradle_NightlySnapshot.groovy
index 7a03f7410b1..194722926e5 100644
--- a/.test-infra/jenkins/job_Release_Gradle_NightlySnapshot.groovy
+++ b/.test-infra/jenkins/job_Release_Gradle_NightlySnapshot.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
// This creates the nightly snapshot build.
// Into https://repository.apache.org/content/groups/snapshots/org/apache/beam.
@@ -27,26 +27,26 @@ job('beam_Release_Gradle_NightlySnapshot') {
concurrentBuild()
// Set common parameters.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// This is a post-commit job that runs once per day, not for every push.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'0 7 * * *',
'[email protected]')
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
'./gradlew publish',
'Run Gradle Publish')
steps {
gradle {
- rootBuildScriptDir(common_job_properties.checkoutDir)
+ rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks('publish')
- common_job_properties.setGradleSwitches(delegate)
+ commonJobProperties.setGradleSwitches(delegate)
// Publish a snapshot build.
switches("-Ppublishing")
// Don't run tasks in parallel, currently the maven-publish/signing
plugins
diff --git a/.test-infra/jenkins/job_beam_PerformanceTests_Analysis.groovy
b/.test-infra/jenkins/job_beam_PerformanceTests_Analysis.groovy
index df9640eb4c3..d718ee9230c 100644
--- a/.test-infra/jenkins/job_beam_PerformanceTests_Analysis.groovy
+++ b/.test-infra/jenkins/job_beam_PerformanceTests_Analysis.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import common_job_properties
+import CommonJobProperties as commonJobProperties
def testConfiguration = [
jobName : 'beam_PerformanceTests_Analysis',
@@ -44,17 +44,17 @@ job(testConfiguration.jobName) {
description(testConfiguration.jobDescription)
// Set default Beam job properties.
- common_job_properties.setTopLevelMainJobProperties(delegate)
+ commonJobProperties.setTopLevelMainJobProperties(delegate)
// Allows triggering this build against pull requests.
- common_job_properties.enablePhraseTriggeringFromPullRequest(
+ commonJobProperties.enablePhraseTriggeringFromPullRequest(
delegate,
testConfiguration.prCommitStatusName,
testConfiguration.prTriggerPhase)
// Run job in postcommit every 24 hours, don't trigger every push, and
// don't email individual committers.
- common_job_properties.setAutoJob(
+ commonJobProperties.setAutoJob(
delegate,
'30 */24 * * *')
@@ -74,9 +74,9 @@ job(testConfiguration.jobName) {
shell('.env/bin/pip install requests google.cloud.bigquery mock')
// Launch verification tests before executing script.
- shell('.env/bin/python ' + common_job_properties.checkoutDir +
'/.test-infra/jenkins/verify_performance_test_results_test.py')
+ shell('.env/bin/python ' + commonJobProperties.checkoutDir +
'/.test-infra/jenkins/verify_performance_test_results_test.py')
// Launch performance tests analysis.
- shell('.env/bin/python ' + common_job_properties.checkoutDir +
'/.test-infra/jenkins/verify_performance_test_results.py --bqtable \"'+
testConfiguration.bqTables + '\" ' + '--metric=\"run_time\" ' + '--mode=report
--send_notification')
+ shell('.env/bin/python ' + commonJobProperties.checkoutDir +
'/.test-infra/jenkins/verify_performance_test_results.py --bqtable \"'+
testConfiguration.bqTables + '\" ' + '--metric=\"run_time\" ' + '--mode=report
--send_notification')
}
}
----------------------------------------------------------------
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:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 121958)
Time Spent: 2h 10m (was: 2h)
> Rename (and reorganize?) jenkins jobs
> -------------------------------------
>
> Key: BEAM-4691
> URL: https://issues.apache.org/jira/browse/BEAM-4691
> Project: Beam
> Issue Type: Task
> Components: build-system
> Reporter: Lukasz Gajowy
> Assignee: Lukasz Gajowy
> Priority: Minor
> Time Spent: 2h 10m
> Remaining Estimate: 0h
>
> Link to discussion:
> [https://lists.apache.org/thread.html/ebe220ec1cebc73c8fb7190cf115fb9b23165fdbf950d58e05db544d@%3Cdev.beam.apache.org%3E]
> Since jobs are Groovy files their names should be CamelCase. We could also
> place them in subdirectories instead of prefixing job names.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
