beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mark...@apache.org
Subject [beam] branch master updated: [BEAM-6908] Refactor Python performance test groovy file for easy configuration (#8518)
Date Fri, 17 May 2019 00:32:09 GMT
This is an automated email from the ASF dual-hosted git repository.

markliu 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 d77474d  [BEAM-6908] Refactor Python performance test groovy file for easy configuration
(#8518)
d77474d is described below

commit d77474d16734cf63095765cbced97ecd4b016b54
Author: Mark Liu <markliu@apache.org>
AuthorDate: Thu May 16 17:31:55 2019 -0700

    [BEAM-6908] Refactor Python performance test groovy file for easy configuration (#8518)
    
    Refactor Python performance test groovy file for easy configuration.
---
 .../jenkins/job_PerformanceTests_Python.groovy     | 158 ++++++++++++++++-----
 .../jenkins/job_Performancetests_Python35.groovy   |  63 --------
 2 files changed, 120 insertions(+), 101 deletions(-)

diff --git a/.test-infra/jenkins/job_PerformanceTests_Python.groovy b/.test-infra/jenkins/job_PerformanceTests_Python.groovy
index 5354d46..732272f 100644
--- a/.test-infra/jenkins/job_PerformanceTests_Python.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_Python.groovy
@@ -18,46 +18,128 @@
 
 import CommonJobProperties as commonJobProperties
 
-// This job runs the Beam Python performance tests on PerfKit Benchmarker.
-job('beam_PerformanceTests_Python'){
-  // Set default Beam job properties.
-  commonJobProperties.setTopLevelMainJobProperties(delegate)
-
-  // Run job in postcommit every 6 hours, don't trigger every push.
-  commonJobProperties.setAutoJob(
-      delegate,
-      'H */6 * * *')
-
-  // Allows triggering this build against pull requests.
-  commonJobProperties.enablePhraseTriggeringFromPullRequest(
-      delegate,
-      'Python SDK Performance Test',
-      'Run Python Performance Test')
-
-  def pipelineArgs = [
-      project: 'apache-beam-testing',
-      staging_location: 'gs://temp-storage-for-end-to-end-tests/staging-it',
-      temp_location: 'gs://temp-storage-for-end-to-end-tests/temp-it',
-      output: 'gs://temp-storage-for-end-to-end-tests/py-it-cloud/output'
-  ]
+
+class PerformanceTestConfigurations {
+  // Name of the Jenkins job
+  String jobName
+  // Description of the Jenkins job
+  String jobDescription
+  // Phrase to trigger this Jenkins job
+  String jobTriggerPhrase
+  // Frequency of the job build, default to every 6 hours
+  String buildSchedule = 'H */6 * * *'
+  // A benchmark defined flag, will pass to benchmark as "--benchmarkName"
+  String benchmarkName = 'beam_integration_benchmark'
+  // A benchmark defined flag, will pass to benchmark as "--bigqueryTable"
+  String resultTable
+  // A benchmark defined flag, will pass to benchmark as "--beam_it_class"
+  String itClass
+  // A benchmark defined flag, will pass to benchmark as "--beam_it_module".
+  // It's a Gradle project that defines 'integrationTest' task. This task is executed by
Perfkit
+  // Beam benchmark launcher and can be added by enablePythonPerformanceTest() defined in
+  // BeamModulePlugin.
+  String itModule
+  // A benchmark defined flag, will pass to benchmark as "--beam_python_sdk_location".
+  // It's the location of Python SDK distribution archive which is required for TestDataflowRunner.
+  String pythonSdkLocation = ''
+  // A benchmark defined flag, will pass to benchmark as "--beam_runner"
+  String runner = 'TestDataflowRunner'
+  // A benchmark defined flag, will pass to benchmark as "--beam_it_timeout"
+  Integer itTimeoutSec = 1200
+  // A benchmark defined flag, will pass to benchmark as "--beam_it_args"
+  Map extraPipelineArgs
+}
+
+// Common pipeline args for Dataflow job.
+def dataflowPipelineArgs = [
+    project         : 'apache-beam-testing',
+    staging_location: 'gs://temp-storage-for-end-to-end-tests/staging-it',
+    temp_location   : 'gs://temp-storage-for-end-to-end-tests/temp-it',
+]
+
+
+// Configurations of each Jenkins job.
+def testConfigurations = [
+    new PerformanceTestConfigurations(
+        jobName           : 'beam_PerformanceTests_WordCountIT_Py27',
+        jobDescription    : 'Python SDK Performance Test - Run WordCountIT in Py27',
+        jobTriggerPhrase  : 'Run Python27 WordCountIT Performance Test',
+        resultTable       : 'beam_performance.wordcount_py27_pkb_results',
+        itClass           : 'apache_beam.examples.wordcount_it_test:WordCountIT.test_wordcount_it',
+        itModule          : 'sdks/python',
+        extraPipelineArgs : dataflowPipelineArgs + [
+            output: 'gs://temp-storage-for-end-to-end-tests/py-it-cloud/output'
+        ],
+    ),
+    new PerformanceTestConfigurations(
+        jobName           : 'beam_PerformanceTests_WordCountIT_Py35',
+        jobDescription    : 'Python SDK Performance Test - Run WordCountIT in Py35',
+        jobTriggerPhrase  : 'Run Python35 WordCountIT Performance Test',
+        resultTable       : 'beam_performance.wordcount_py35_pkb_results',
+        itClass           : 'apache_beam.examples.wordcount_it_test:WordCountIT.test_wordcount_it',
+        itModule          : 'sdks/python/test-suites/dataflow/py35',
+        extraPipelineArgs : dataflowPipelineArgs + [
+            output: 'gs://temp-storage-for-end-to-end-tests/py-it-cloud/output'
+        ],
+    )
+]
+
+
+for (testConfig in testConfigurations) {
+  createPythonPerformanceTestJob(testConfig)
+}
+
+
+private void createPythonPerformanceTestJob(PerformanceTestConfigurations testConfig) {
+  // This job runs the Beam Python performance tests on PerfKit Benchmarker.
+  job(testConfig.jobName) {
+    // Set default Beam job properties.
+    commonJobProperties.setTopLevelMainJobProperties(delegate)
+
+    // Run job in postcommit, don't trigger every push.
+    commonJobProperties.setAutoJob(
+        delegate,
+        testConfig.buildSchedule)
+
+    // Allows triggering this build against pull requests.
+    commonJobProperties.enablePhraseTriggeringFromPullRequest(
+        delegate,
+        testConfig.jobDescription,
+        testConfig.jobTriggerPhrase)
+
+    def argMap = [
+        beam_sdk                : 'python',
+        benchmarks              : testConfig.benchmarkName,
+        bigquery_table          : testConfig.resultTable,
+        beam_it_class           : testConfig.itClass,
+        beam_it_module          : testConfig.itModule,
+        beam_prebuilt           : 'true',   // Python benchmark don't need to prebuild repo
before running
+        beam_python_sdk_location: getSDKLocationFromModule(testConfig.pythonSdkLocation,
+                                                           testConfig.itModule),
+        beam_runner             : testConfig.runner,
+        beam_it_timeout         : testConfig.itTimeoutSec.toString(),
+        beam_it_args            : joinPipelineArgs(testConfig.extraPipelineArgs),
+    ]
+
+    commonJobProperties.buildPerformanceTest(delegate, argMap)
+  }
+}
+
+
+// Helper function to join pipeline args from a map.
+private static String joinPipelineArgs(Map pipelineArgs) {
   def pipelineArgList = []
   pipelineArgs.each({
     key, value -> pipelineArgList.add("--$key=$value")
   })
-  def pipelineArgsJoined = pipelineArgList.join(',')
-
-  def argMap = [
-      beam_sdk                 : 'python',
-      benchmarks               : 'beam_integration_benchmark',
-      bigquery_table           : 'beam_performance.wordcount_py_pkb_results',
-      beam_it_class            : 'apache_beam.examples.wordcount_it_test:WordCountIT.test_wordcount_it',
-      beam_it_module           : 'sdks/python',
-      beam_prebuilt            : 'true',  // skip beam prebuild
-      beam_python_sdk_location : 'build/apache-beam.tar.gz',
-      beam_runner              : 'TestDataflowRunner',
-      beam_it_timeout          : '1200',
-      beam_it_args             : pipelineArgsJoined,
-  ]
-
-  commonJobProperties.buildPerformanceTest(delegate, argMap)
+  return pipelineArgList.join(',')
+}
+
+
+// Get relative path of sdk location based on itModule if the location is not provided.
+private static String getSDKLocationFromModule(String pythonSDKLocation, String itModule)
{
+  if (!pythonSDKLocation && itModule.startsWith("sdks/python")) {
+    return (itModule.substring("sdks/python".length()) + "/build/apache-beam.tar.gz").substring(1)
+  }
+  return pythonSDKLocation
 }
diff --git a/.test-infra/jenkins/job_Performancetests_Python35.groovy b/.test-infra/jenkins/job_Performancetests_Python35.groovy
deleted file mode 100644
index 41e0fcc..0000000
--- a/.test-infra/jenkins/job_Performancetests_Python35.groovy
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import CommonJobProperties as commonJobProperties
-
-// This job runs the Beam Python35 performance benchmark on PerfKit Benchmarker.
-job('beam_PerformanceTests_Python35'){
-  // Set default Beam job properties.
-  commonJobProperties.setTopLevelMainJobProperties(delegate)
-
-  // Run job in postcommit every 6 hours, don't trigger every push.
-  commonJobProperties.setAutoJob(
-      delegate,
-      'H */6 * * *')
-
-  // Allows triggering this build against pull requests.
-  commonJobProperties.enablePhraseTriggeringFromPullRequest(
-      delegate,
-      'Python35 SDK Performance Test',
-      'Run Python35 Performance Test')
-
-  def pipelineArgs = [
-      project: 'apache-beam-testing',
-      staging_location: 'gs://temp-storage-for-end-to-end-tests/staging-it',
-      temp_location: 'gs://temp-storage-for-end-to-end-tests/temp-it',
-      output: 'gs://temp-storage-for-end-to-end-tests/py-it-cloud/output'
-  ]
-  def pipelineArgList = []
-  pipelineArgs.each({
-    key, value -> pipelineArgList.add("--$key=$value")
-  })
-  def pipelineArgsJoined = pipelineArgList.join(',')
-
-  def argMap = [
-      beam_sdk                 : 'python',
-      benchmarks               : 'beam_integration_benchmark',
-      bigquery_table           : 'beam_performance.wordcount_py35_pkb_results',
-      beam_it_class            : 'apache_beam.examples.wordcount_it_test:WordCountIT.test_wordcount_it',
-      beam_it_module           : 'sdks/python/test-suites/dataflow/py35',
-      beam_prebuilt            : 'true',  // skip beam prebuild
-      beam_python_sdk_location : 'test-suites/dataflow/py35/build/apache-beam.tar.gz',
-      beam_runner              : 'TestDataflowRunner',
-      beam_it_timeout          : '1200',
-      beam_it_args             : pipelineArgsJoined,
-  ]
-
-  commonJobProperties.buildPerformanceTest(delegate, argMap)
-}


Mime
View raw message