You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lg...@apache.org on 2019/03/19 12:27:52 UTC
[beam] branch master updated: [BEAM-6848] changed datatset key name
in load test builder. Added checking context in test
This is an automated email from the ASF dual-hosted git repository.
lgajowy 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 9dfcb0a [BEAM-6848] changed datatset key name in load test builder. Added checking context in test
new e73e8e6 Merge pull request #8078: [BEAM-6848] changed datatset in load test builder. Added checking context in test
9dfcb0a is described below
commit 9dfcb0ae7d6d8c50eb4f2126ffb73e77286fa6e1
Author: Kasia Kucharczyk <ka...@polidea.com>
AuthorDate: Mon Mar 18 16:37:33 2019 +0100
[BEAM-6848] changed datatset key name in load test builder. Added checking context in test
---
.test-infra/jenkins/LoadTestsBuilder.groovy | 4 ++--
.test-infra/jenkins/job_LoadTests_Java.groovy | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.test-infra/jenkins/LoadTestsBuilder.groovy b/.test-infra/jenkins/LoadTestsBuilder.groovy
index 4a732a1..08bbb30 100644
--- a/.test-infra/jenkins/LoadTestsBuilder.groovy
+++ b/.test-infra/jenkins/LoadTestsBuilder.groovy
@@ -26,7 +26,7 @@ class LoadTestsBuilder {
options.put('runner', runner.option)
- String datasetKey = 'bigQueryDatasetName'
+ String datasetKey = 'bigQueryDataset'
String datasetValue = options.get(datasetKey)
if (datasetValue) {
@@ -62,7 +62,7 @@ class LoadTestsBuilder {
}.join(' ')
}
- private String setContextualDatasetName(String baseName, TriggeringContext triggeringContext) {
+ private static String setContextualDatasetName(String baseName, TriggeringContext triggeringContext) {
if (triggeringContext == TriggeringContext.PR) {
return baseName + '_PRs'
} else {
diff --git a/.test-infra/jenkins/job_LoadTests_Java.groovy b/.test-infra/jenkins/job_LoadTests_Java.groovy
index 5abe90c..c365ba5 100644
--- a/.test-infra/jenkins/job_LoadTests_Java.groovy
+++ b/.test-infra/jenkins/job_LoadTests_Java.groovy
@@ -206,17 +206,17 @@ def loadTestConfigurations = [
]
]
-def loadTestJob = { scope ->
+def loadTestJob = { scope, triggeringContext ->
scope.description('Runs Java GBK load tests on Dataflow runner in batch mode')
commonJobProperties.setTopLevelMainJobProperties(scope, 'master', 240)
for (testConfiguration in loadTestConfigurations) {
- loadTestsBuilder.loadTest(scope, testConfiguration.title, testConfiguration.runner, CommonTestProperties.SDK.JAVA, testConfiguration.jobProperties, testConfiguration.itClass, CommonTestProperties.TriggeringContext.PR)
+ loadTestsBuilder.loadTest(scope, testConfiguration.title, testConfiguration.runner, CommonTestProperties.SDK.JAVA, testConfiguration.jobProperties, testConfiguration.itClass, triggeringContext)
}
}
CronJobBuilder.cronJob('beam_LoadTests_Java_GBK_Dataflow_Batch', 'H 12 * * *', this) {
- loadTestJob(delegate)
+ loadTestJob(delegate, CommonTestProperties.TriggeringContext.PR)
}
PhraseTriggeringPostCommitBuilder.postCommitJob(
@@ -225,7 +225,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob(
'Load Tests Java GBK Dataflow Batch suite',
this
) {
- loadTestJob(delegate)
+ loadTestJob(delegate, CommonTestProperties.TriggeringContext.POST_COMMIT)
}