kileys commented on code in PR #23609:
URL: https://github.com/apache/beam/pull/23609#discussion_r994048958


##########
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy:
##########
@@ -31,163 +31,12 @@ import static NexmarkDatabaseProperties.nexmarkInfluxDBArgs
 // This job runs the suite of ValidatesRunner tests against the Dataflow 
runner.
 
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Dataflow',
     'Dataflow Runner Nexmark Tests', this) {
+
       description('Runs the Nexmark suite on the Dataflow runner.')
 
-      // Set common parameters.
       commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
-      InfluxDBCredentialsHelper.useCredentials(delegate)
 
-      // Gradle goals for this job.
-      steps {
-        shell('echo "*** RUN NEXMARK IN BATCH MODE USING DATAFLOW RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DataflowRunner',
-                '--region=us-central1',
-                '--numWorkers=4',
-                '--maxNumWorkers=4',
-                '--autoscalingAlgorithm=NONE',
-                '--nexmarkParallel=16',
-                '--streaming=false',
-                '--suite=STRESS',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN STREAMING MODE USING DATAFLOW RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DataflowRunner',
-                '--region=us-central1',
-                '--numWorkers=4',
-                '--maxNumWorkers=4',
-                '--autoscalingAlgorithm=NONE',
-                '--nexmarkParallel=16',
-                '--streaming=true',
-                '--suite=STRESS',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN SQL BATCH MODE USING DATAFLOW RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DataflowRunner',
-                '--region=us-central1',
-                '--numWorkers=4',
-                '--maxNumWorkers=4',
-                '--autoscalingAlgorithm=NONE',
-                '--nexmarkParallel=16',
-                '--queryLanguage=sql',
-                '--streaming=false',
-                '--suite=STRESS',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN SQL STREAMING MODE USING DATAFLOW 
RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DataflowRunner',
-                '--region=us-central1',
-                '--numWorkers=4',
-                '--maxNumWorkers=4',
-                '--autoscalingAlgorithm=NONE',
-                '--nexmarkParallel=16',
-                '--queryLanguage=sql',
-                '--streaming=true',
-                '--suite=STRESS',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN ZETASQL BATCH MODE USING DATAFLOW 
RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DataflowRunner',
-                '--region=us-central1',
-                '--numWorkers=4',
-                '--maxNumWorkers=4',
-                '--autoscalingAlgorithm=NONE',
-                '--nexmarkParallel=16',
-                '--queryLanguage=zetasql',
-                '--streaming=false',
-                '--suite=STRESS',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN ZETASQL STREAMING MODE USING DATAFLOW 
RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DataflowRunner',
-                '--region=us-central1',
-                '--numWorkers=4',
-                '--maxNumWorkers=4',
-                '--autoscalingAlgorithm=NONE',
-                '--nexmarkParallel=16',
-                '--queryLanguage=zetasql',
-                '--streaming=true',
-                '--suite=STRESS',
-                '--manageResources=false',
-                '--monitorJobs=true',

Review Comment:
   Do we need these options?



##########
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy:
##########
@@ -30,133 +30,12 @@ import static NexmarkDatabaseProperties.nexmarkInfluxDBArgs
 
 
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Direct',
     'Direct Runner Nexmark Tests', this) {
+
       description('Runs the Nexmark suite on the Direct runner.')
 
-      // Set common parameters.
       commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 
240, true, 'beam-perf')
-      InfluxDBCredentialsHelper.useCredentials(delegate)
 
-      // Gradle goals for this job.
-      steps {
-        shell('echo "*** RUN NEXMARK IN BATCH MODE USING DIRECT RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:direct-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DirectRunner',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN STREAMING MODE USING DIRECT RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:direct-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DirectRunner',
-                '--streaming=true',
-                '--suite=SMOKE',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN SQL BATCH MODE USING DIRECT RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:direct-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DirectRunner',
-                '--queryLanguage=sql',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN SQL STREAMING MODE USING DIRECT RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:direct-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DirectRunner',
-                '--queryLanguage=sql',
-                '--streaming=true',
-                '--suite=SMOKE',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN ZETASQL BATCH MODE USING DIRECT RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:direct-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DirectRunner',
-                '--queryLanguage=zetasql',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--manageResources=false',
-                '--monitorJobs=true',
-                '--enforceEncodability=true',
-                '--enforceImmutability=true"'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN ZETASQL STREAMING MODE USING DIRECT 
RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:direct-java"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=DirectRunner',
-                '--queryLanguage=zetasql',
-                '--streaming=true',
-                '--suite=SMOKE',
-                '--manageResources=false',
-                '--monitorJobs=true',

Review Comment:
   Same question



##########
.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy:
##########
@@ -23,175 +23,16 @@ import CommonTestProperties.TriggeringContext
 import NexmarkBuilder as Nexmark
 import NoPhraseTriggeringPostCommitBuilder
 import PhraseTriggeringPostCommitBuilder
-import InfluxDBCredentialsHelper
-
-import static NexmarkDatabaseProperties.nexmarkBigQueryArgs
-import static NexmarkDatabaseProperties.nexmarkInfluxDBArgs
 
 // This job runs the suite of ValidatesRunner tests against the Spark runner.
 
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Spark',
     'Spark Runner Nexmark Tests', this) {
+
       description('Runs the Nexmark suite on the Spark runner.')
 
-      // Set common parameters.
       commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 
240, true, 'beam-perf')
-      InfluxDBCredentialsHelper.useCredentials(delegate)
 
-      // Gradle goals for this job.
-      steps {
-        shell('echo "*** RUN NEXMARK IN BATCH MODE USING SPARK 2 RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:spark:2"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=SparkRunner',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--streamTimeout=60' ,
-                '--manageResources=false',
-                '--monitorJobs=true'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK SQL IN BATCH MODE USING SPARK 2 RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:spark:2"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=SparkRunner',
-                '--queryLanguage=sql',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--streamTimeout=60' ,
-                '--manageResources=false',
-                '--monitorJobs=true'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN BATCH MODE USING SPARK 3 RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:spark:3"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=SparkRunner',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--streamTimeout=60' ,
-                '--manageResources=false',
-                '--monitorJobs=true'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK SQL IN BATCH MODE USING SPARK 3 RUNNER 
***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:spark:3"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=SparkRunner',
-                '--queryLanguage=sql',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--streamTimeout=60' ,
-                '--manageResources=false',
-                '--monitorJobs=true'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN BATCH MODE USING SPARK 2 STRUCTURED 
STREAMING RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:spark:2"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=SparkStructuredStreamingRunner',
-                '--streaming=false',
-                '--suite=SMOKE',
-                // Skip query 3 (SparkStructuredStreamingRunner does not 
support State/Timers yet)
-                '--skipQueries=3',
-                '--streamTimeout=60' ,
-                '--manageResources=false',
-                '--monitorJobs=true'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK SQL IN BATCH MODE USING SPARK 2 
STRUCTURED STREAMING RUNNER ***"')
-        gradle {
-          rootBuildScriptDir(commonJobProperties.checkoutDir)
-          tasks(':sdks:java:testing:nexmark:run')
-          commonJobProperties.setGradleSwitches(delegate)
-          switches('-Pnexmark.runner=":runners:spark:2"' +
-              ' -Pnexmark.args="' +
-              [
-                commonJobProperties.mapToArgString(nexmarkBigQueryArgs),
-                commonJobProperties.mapToArgString(nexmarkInfluxDBArgs),
-                '--runner=SparkStructuredStreamingRunner',
-                '--queryLanguage=sql',
-                '--streaming=false',
-                '--suite=SMOKE',
-                '--streamTimeout=60' ,
-                '--manageResources=false',
-                '--monitorJobs=true'
-              ].join(' '))
-        }
-        shell('echo "*** RUN NEXMARK IN BATCH MODE USING SPARK 3 STRUCTURED 
STREAMING RUNNER ***"')

Review Comment:
   Missing spark 3 tests. Also, are they being treated the same metric as spark 
2?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to