[
https://issues.apache.org/jira/browse/BEAM-2141?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16332783#comment-16332783
]
ASF GitHub Bot commented on BEAM-2141:
--------------------------------------
chamikaramj closed pull request #3668: [BEAM-2141] Updates jenkins job for
JDBCIOIT
URL: https://github.com/apache/beam/pull/3668
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/common_job_properties.groovy
index 2930d741608..7d0f49b362e 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -254,20 +254,26 @@ class common_job_properties {
return mapToArgString(joinedArgs)
}
+ private static def buildPerfKit(def context) {
+ context.steps {
+ // Clean up environment.
+ shell('rm -rf PerfKitBenchmarker')
+ // Clone appropriate perfkit branch
+ shell('git clone
https://github.com/GoogleCloudPlatform/PerfKitBenchmarker.git')
+ // Install Perfkit benchmark requirements.
+ shell('pip install --user -r PerfKitBenchmarker/requirements.txt')
+ // Install job requirements for Python SDK.
+ shell('pip install --user -e sdks/python/[gcp,test]')
+ }
+ }
+
// Adds the standard performance test job steps.
static def buildPerformanceTest(def context, def argMap) {
def pkbArgs = genPerformanceArgs(argMap)
+ buildPerfKit(context)
context.steps {
- // Clean up environment.
- shell('rm -rf PerfKitBenchmarker')
- // Clone appropriate perfkit branch
- shell('git clone
https://github.com/GoogleCloudPlatform/PerfKitBenchmarker.git')
- // Install Perfkit benchmark requirements.
- shell('pip install --user -r PerfKitBenchmarker/requirements.txt')
- // Install job requirements for Python SDK.
- shell('pip install --user -e sdks/python/[gcp,test]')
- // Launch performance test.
- shell("python PerfKitBenchmarker/pkb.py $pkbArgs")
+ // Launch performance test.
+ shell("python PerfKitBenchmarker/pkb.py $pkbArgs")
}
}
diff --git a/.test-infra/jenkins/job_beam_PerformanceTests_JDBC.groovy
b/.test-infra/jenkins/job_beam_PerformanceTests_JDBC.groovy
index ef73a261b0c..6b0abe91fba 100644
--- a/.test-infra/jenkins/job_beam_PerformanceTests_JDBC.groovy
+++ b/.test-infra/jenkins/job_beam_PerformanceTests_JDBC.groovy
@@ -32,32 +32,59 @@ job('beam_PerformanceTests_JDBC'){
'commits@beam.apache.org',
false)
- def pipelineArgs = [
- tempRoot: 'gs://temp-storage-for-end-to-end-tests',
- project: 'apache-beam-testing',
- postgresServerName: '10.36.0.11',
- postgresUsername: 'postgres',
- postgresDatabaseName: 'postgres',
- postgresPassword: 'uuinkks',
- postgresSsl: 'false'
+ common_job_properties.buildPerfKit(delegate)
+
+ // Allows triggering this build against pull requests.
+ common_job_properties.enablePhraseTriggeringFromPullRequest(
+ delegate,
+ 'JDBC Performance Test',
+ 'Run JDBC Performance Test')
+
+ clean_install_command = [
+ '/home/jenkins/tools/maven/latest/bin/mvn',
+ '-B',
+ '-e',
+ "-Pdataflow-runner",
+ 'clean',
+ 'install',
+ // TODO: remove following since otherwise build could break due to
changes to other mvn projects
+ "-pl runners/google-cloud-dataflow-java",
+ '-DskipTests'
]
- def pipelineArgList = []
- pipelineArgs.each({
- key, value -> pipelineArgList.add("--$key=$value")
- })
- def pipelineArgsJoined = pipelineArgList.join(',')
-
- def argMap = [
- benchmarks: 'beam_integration_benchmark',
- beam_it_module: 'sdks/java/io/jdbc',
- beam_it_args: pipelineArgsJoined,
- beam_it_class: 'org.apache.beam.sdk.io.jdbc.JdbcIOIT',
- // Profile is located in $BEAM_ROOT/sdks/java/io/pom.xml.
- beam_it_profile: 'io-it'
+
+ io_it_suite_command = [
+ '/home/jenkins/tools/maven/latest/bin/mvn',
+ '-B',
+ '-e',
+ 'verify',
+ '-pl sdks/java/io/jdbc',
+ '-Dio-it-suite',
+ '-DpkbLocation="$WORKSPACE/PerfKitBenchmarker/pkb.py"',
+ '-DmvnBinary=/home/jenkins/tools/maven/latest/bin/mvn',
+ '-Dkubectl=/usr/lib/google-cloud-sdk/bin/kubectl',
+// '-Dkubeconfig=, # TODO(chamikara): should we set this
+ '-DintegrationTestPipelineOptions=\'[
"--project=apache-beam-testing",
"--tempRoot=gs://temp-storage-for-end-to-end-tests" ]\''
]
- common_job_properties.buildPerformanceTest(delegate, argMap)
+ // Allow the test to only run on particular nodes
+ // TODO: Remove once the tests can run on all nodes
+ parameters {
+ nodeParam('TEST_HOST') {
+ description('select test host beam1 till kubectl is installed in
other hosts')
+ defaultNodes(['beam2'])
+ allowedNodes(['beam2'])
+ trigger('multiSelectionDisallowed')
+ eligibility('IgnoreOfflineNodeEligibility')
+ }
+ }
- // [BEAM-2141] Perf tests do not pass.
- disabled()
+ steps {
+// shell('echo xyz123')
+// shell('export PATH=$PATH:/usr/lib/google-cloud-sdk/bin')
+// shell('echo $PATH')
+// shell('ls /usr/lib/google-cloud-sdk/bin')
+ shell('/usr/lib/google-cloud-sdk/bin/kubectl help')
+ shell(clean_install_command.join(' '))
+ shell(io_it_suite_command.join(' '))
+ }
}
diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml
index 3a5f53b05ae..558eebd879d 100644
--- a/sdks/java/io/jdbc/pom.xml
+++ b/sdks/java/io/jdbc/pom.xml
@@ -126,6 +126,7 @@
<argument>-beam_it_profile=io-it</argument>
<argument>-beam_location=${beamRootProjectDir}</argument>
<argument>-beam_prebuilt=true</argument>
+ <argument>-maven_binary=${mvnBinary}</argument>
<argument>-beam_sdk=java</argument>
<argument>-kubeconfig=${kubeconfig}</argument>
<argument>-kubectl=${kubectl}</argument>
----------------------------------------------------------------
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:
us...@infra.apache.org
> beam_PerformanceTests_JDBC have not passed in weeks
> ---------------------------------------------------
>
> Key: BEAM-2141
> URL: https://issues.apache.org/jira/browse/BEAM-2141
> Project: Beam
> Issue Type: Bug
> Components: testing
> Reporter: Daniel Halperin
> Assignee: Jason Kuster
> Priority: Major
> Fix For: Not applicable
>
>
> https://builds.apache.org/job/beam_PerformanceTests_JDBC/
> Disabling them, as no one seems to be maintaining them.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
