You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by mm...@apache.org on 2022/09/12 07:32:11 UTC
[beam] branch master updated: [TPC-DS] Use common queries argument for Jenkins jobs (#23139)
This is an automated email from the ASF dual-hosted git repository.
mmack 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 b1f23fd066b [TPC-DS] Use common queries argument for Jenkins jobs (#23139)
b1f23fd066b is described below
commit b1f23fd066ba89b26f4658028dbf7878b3e34bc1
Author: Alexey Romanenko <33...@users.noreply.github.com>
AuthorDate: Mon Sep 12 09:32:00 2022 +0200
[TPC-DS] Use common queries argument for Jenkins jobs (#23139)
---
.test-infra/jenkins/TpcdsDatabaseProperties.groovy | 2 ++
.test-infra/jenkins/job_PostCommit_Java_Tpcds_Dataflow.groovy | 5 +++--
.test-infra/jenkins/job_PostCommit_Java_Tpcds_Flink.groovy | 5 +++--
.test-infra/jenkins/job_PostCommit_Java_Tpcds_Spark.groovy | 9 +++++----
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/.test-infra/jenkins/TpcdsDatabaseProperties.groovy b/.test-infra/jenkins/TpcdsDatabaseProperties.groovy
index 7819963e42a..289537bd070 100644
--- a/.test-infra/jenkins/TpcdsDatabaseProperties.groovy
+++ b/.test-infra/jenkins/TpcdsDatabaseProperties.groovy
@@ -37,4 +37,6 @@ class TpcdsDatabaseProperties {
'exportSummaryToInfluxDB': true,
'influxRetentionPolicy' : 'forever',
]
+
+ static String tpcdsQueriesArg = '3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Dataflow.groovy
index de619c24812..91882c01d81 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Dataflow.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Dataflow.groovy
@@ -23,6 +23,7 @@ import InfluxDBCredentialsHelper
import static TpcdsDatabaseProperties.tpcdsBigQueryArgs
import static TpcdsDatabaseProperties.tpcdsInfluxDBArgs
+import static TpcdsDatabaseProperties.tpcdsQueriesArg
// This job runs the suite of Tpcds tests against the Dataflow runner.
@@ -56,7 +57,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Da
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/dataflow/',
'--tpcParallel=1',
- '--queries=3'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
}
@@ -91,7 +92,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Data
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/dataflow/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Flink.groovy
index 53f04ef74ec..b8dd79a7e76 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Flink.groovy
@@ -23,6 +23,7 @@ import InfluxDBCredentialsHelper
import static TpcdsDatabaseProperties.tpcdsBigQueryArgs
import static TpcdsDatabaseProperties.tpcdsInfluxDBArgs
+import static TpcdsDatabaseProperties.tpcdsQueriesArg
// This job runs the Tpcds benchmark suite against the Flink runner.
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Flink',
@@ -52,7 +53,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Fl
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/flink/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
}
@@ -86,7 +87,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Flin
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/flink/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Spark.groovy b/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Spark.groovy
index 3531d578623..4d14c0e64a7 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Spark.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Tpcds_Spark.groovy
@@ -23,6 +23,7 @@ import InfluxDBCredentialsHelper
import static TpcdsDatabaseProperties.tpcdsBigQueryArgs
import static TpcdsDatabaseProperties.tpcdsInfluxDBArgs
+import static TpcdsDatabaseProperties.tpcdsQueriesArg
// This job runs the Tpcds benchmark suite against the Spark runner.
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Spark',
@@ -51,7 +52,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Sp
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/spark3-rdd/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
shell('echo "*** RUN TPC-DS USING SPARK 3 DATASET RUNNER ***"')
@@ -70,7 +71,7 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Sp
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/spark3-dataset/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
}
@@ -103,7 +104,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Spar
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/spark3-rdd/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
shell('echo "*** RUN TPC-DS USING SPARK 3 DATASET RUNNER ***"')
@@ -122,7 +123,7 @@ PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Tpcds_Spar
'--dataDirectory=gs://beam-tpcds/datasets/parquet/partitioned',
'--resultsDirectory=gs://beam-tpcds/results/spark3-dataset/',
'--tpcParallel=1',
- '--queries=3,7,10,25,26,29,35,38,40,42,43,52,55,69,79,83,84,87,93,96'
+ '--queries=' + tpcdsQueriesArg
].join(' '))
}
}