This is an automated email from the ASF dual-hosted git repository. lcwik 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 fa37fc5 [BEAM-4046, BEAM-7307] revert PR 8581, migrate jenkins tests to use directory based names instead of artifact names (#8881) fa37fc5 is described below commit fa37fc5e176e72fd346b9a0bb907d9726b33d018 Author: Lukasz Cwik <lukec...@gmail.com> AuthorDate: Thu Jun 20 09:13:38 2019 -0700 [BEAM-4046, BEAM-7307] revert PR 8581, migrate jenkins tests to use directory based names instead of artifact names (#8881) * Revert "[BEAM-4046] revert test infra to be compatible with pending PRs" This reverts commit a32c8db037a4635a914de2e6e87fdd4a7b2d9ccc. * Additional changes needed to remove references to projects that were renamed from :beam-... to use the project path. * fixup! Fix typo --- .test-infra/jenkins/CommonTestProperties.groovy | 8 ++++---- .test-infra/jenkins/Infrastructure.groovy | 2 +- .test-infra/jenkins/LoadTestsBuilder.groovy | 4 ++-- .test-infra/jenkins/NexmarkBuilder.groovy | 2 +- .../job_PostCommit_Java11_Dataflow_Examples.groovy | 2 +- ...ostCommit_Java11_Dataflow_Portability_Examples.groovy | 2 +- ...Java11_ValidatesRunner_PortabilityApi_Dataflow.groovy | 2 +- .../jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy | 16 ++++++++-------- .../jenkins/job_PostCommit_Java_Nexmark_Direct.groovy | 16 ++++++++-------- .../jenkins/job_PostCommit_Java_Nexmark_Flink.groovy | 16 ++++++++-------- .../jenkins/job_PostCommit_Java_Nexmark_Spark.groovy | 8 ++++---- ...ommit_Java_PortableValidatesRunner_Flink_Batch.groovy | 2 +- ...t_Java_PortableValidatesRunner_Flink_Streaming.groovy | 2 +- .../job_PostCommit_Java_ValidatesRunner_Apex.groovy | 2 +- .../job_PostCommit_Java_ValidatesRunner_Dataflow.groovy | 2 +- ...datesRunner_DataflowPortabilityExecutableStage.groovy | 2 +- ...ostCommit_Java_ValidatesRunner_Dataflow_Java11.groovy | 2 +- .../job_PostCommit_Java_ValidatesRunner_Direct.groovy | 2 +- ..._PostCommit_Java_ValidatesRunner_Direct_Java11.groovy | 6 +++--- .../job_PostCommit_Java_ValidatesRunner_Flink.groovy | 2 +- .../job_PostCommit_Java_ValidatesRunner_Gearpump.groovy | 2 +- ...t_Java_ValidatesRunner_PortabilityApi_Dataflow.groovy | 2 +- .../job_PostCommit_Java_ValidatesRunner_Samza.groovy | 2 +- .../job_PostCommit_Java_ValidatesRunner_Spark.groovy | 2 +- .../jenkins/job_PostCommit_Website_Publish.groovy | 4 ++-- .test-infra/jenkins/job_PostCommit_Website_Test.groovy | 2 +- .../job_PreCommit_Python_ValidatesRunner_Flink.groovy | 2 +- .../jenkins/job_PreCommit_Website_Stage_GCS.groovy | 2 +- .../jenkins/job_Release_Python_NightlySnapshot.groovy | 4 ++-- examples/kotlin/build.gradle | 2 +- sdks/java/extensions/euphoria/README.md | 2 +- .../sql/example/BeamSqlDataCatalogExample.java | 2 +- sdks/python/build.gradle | 2 +- website/src/documentation/sdks/nexmark.md | 2 +- website/src/roadmap/portability.md | 2 +- 35 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.test-infra/jenkins/CommonTestProperties.groovy b/.test-infra/jenkins/CommonTestProperties.groovy index 0fe3934..14dd7b0 100644 --- a/.test-infra/jenkins/CommonTestProperties.groovy +++ b/.test-infra/jenkins/CommonTestProperties.groovy @@ -33,10 +33,10 @@ class CommonTestProperties { def RUNNER_DEPENDENCY_MAP = [ JAVA: [ - DATAFLOW: ":beam-runners-google-cloud-dataflow-java", - SPARK: ":beam-runners-spark", - FLINK: ":beam-runners-flink_2.11", - DIRECT: ":beam-runners-direct-java" + DATAFLOW: ":runners:google-cloud-dataflow-java", + SPARK: ":runners:spark", + FLINK: ":runners:flink:1.5", + DIRECT: ":runners:direct-java" ], PYTHON: [ DATAFLOW: "TestDataflowRunner", diff --git a/.test-infra/jenkins/Infrastructure.groovy b/.test-infra/jenkins/Infrastructure.groovy index ebdc673..eb2d9fd 100644 --- a/.test-infra/jenkins/Infrastructure.groovy +++ b/.test-infra/jenkins/Infrastructure.groovy @@ -31,7 +31,7 @@ class Infrastructure { gradle { rootBuildScriptDir(common.checkoutDir) common.setGradleSwitches(delegate) - tasks(":beam-sdks-${sdkName}-container:docker") + tasks(":sdks:${sdkName}:container:docker") switches("-Pdocker-repository-root=${repositoryRoot}") switches("-Pdocker-tag=${dockerTag}") } diff --git a/.test-infra/jenkins/LoadTestsBuilder.groovy b/.test-infra/jenkins/LoadTestsBuilder.groovy index 6d7ee7e..b9bf0b5 100644 --- a/.test-infra/jenkins/LoadTestsBuilder.groovy +++ b/.test-infra/jenkins/LoadTestsBuilder.groovy @@ -58,9 +58,9 @@ class LoadTestsBuilder { private static String getGradleTaskName(SDK sdk) { if (sdk == SDK.JAVA) { - return ':beam-sdks-java-load-tests:run' + return ':beam:sdks:java:load-tests:run' } else if (sdk == SDK.PYTHON) { - return ':beam-sdks-python-load-tests:run' + return ':sdks:python:apache_beam:testing:load-tests:run' } else { throw new RuntimeException("No task name defined for SDK: $SDK") } diff --git a/.test-infra/jenkins/NexmarkBuilder.groovy b/.test-infra/jenkins/NexmarkBuilder.groovy index f2b0c24..32a4e13 100644 --- a/.test-infra/jenkins/NexmarkBuilder.groovy +++ b/.test-infra/jenkins/NexmarkBuilder.groovy @@ -79,7 +79,7 @@ class NexmarkBuilder { shell("echo *** RUN ${title} ***") gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) switches("-Pnexmark.runner=${runner.getDepenedencyBySDK(sdk)}") switches("-Pnexmark.args=\"${parseOptions(options)}\"") diff --git a/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Examples.groovy b/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Examples.groovy index ad7546e..9e1004c 100644 --- a/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Examples.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Examples.groovy @@ -33,7 +33,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java11_Examples_Dataflow', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java-examples:java11PostCommit') + tasks(':runners:google-cloud-dataflow-java:examples:java11PostCommit') // Increase parallel worker threads above processor limit since most time is // spent waiting on Dataflow jobs. ValidatesRunner tests on Dataflow are slow diff --git a/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Portability_Examples.groovy b/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Portability_Examples.groovy index b670352..eadf255 100644 --- a/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Portability_Examples.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java11_Dataflow_Portability_Examples.groovy @@ -33,7 +33,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java11_Examples_Dataflow_Por steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java-examples:verifyPortabilityApi') + tasks(':runners:google-cloud-dataflow-java:examples:verifyPortabilityApi') switches ('-Pdockerfile=Dockerfile-java11') // Increase parallel worker threads above processor limit since most time is diff --git a/.test-infra/jenkins/job_PostCommit_Java11_ValidatesRunner_PortabilityApi_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java11_ValidatesRunner_PortabilityApi_Dataflow.groovy index 9210139..fa5053a 100644 --- a/.test-infra/jenkins/job_PostCommit_Java11_ValidatesRunner_PortabilityApi_Dataflow.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java11_ValidatesRunner_PortabilityApi_Dataflow.groovy @@ -34,7 +34,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java11_ValidatesRunner_Porta steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java:validatesRunnerFnApiWorkerTest') + tasks(':runners:google-cloud-dataflow-java:validatesRunnerFnApiWorkerTest') switches ('-Pdockerfile=Dockerfile-java11') // Increase parallel worker threads above processor limit since most time is diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy index 30b59f1..2b6f3c3 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow.groovy @@ -38,9 +38,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN BATCH MODE USING DATAFLOW RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-google-cloud-dataflow-java"' + + switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DataflowRunner', @@ -58,9 +58,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN STREAMING MODE USING DATAFLOW RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-google-cloud-dataflow-java"' + + switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DataflowRunner', @@ -78,9 +78,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN SQL BATCH MODE USING DATAFLOW RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-google-cloud-dataflow-java"' + + switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DataflowRunner', @@ -99,9 +99,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN SQL STREAMING MODE USING DATAFLOW RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-google-cloud-dataflow-java"' + + switches('-Pnexmark.runner=":runners:google-cloud-dataflow-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DataflowRunner', diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy index 1318059..706b536 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Direct.groovy @@ -37,9 +37,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN BATCH MODE USING DIRECT RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-direct-java"' + + switches('-Pnexmark.runner=":runners:direct-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DirectRunner', @@ -53,9 +53,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN STREAMING MODE USING DIRECT RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-direct-java"' + + switches('-Pnexmark.runner=":runners:direct-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DirectRunner', @@ -69,9 +69,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN SQL BATCH MODE USING DIRECT RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-direct-java"' + + switches('-Pnexmark.runner=":runners:direct-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DirectRunner', @@ -86,9 +86,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN SQL STREAMING MODE USING DIRECT RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-direct-java"' + + switches('-Pnexmark.runner=":runners:direct-java"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=DirectRunner', diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy index 63fc48c..065f74d 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Flink.groovy @@ -38,9 +38,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN BATCH MODE USING FLINK RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-flink_2.11"' + + switches('-Pnexmark.runner=":runners:flink:1.5"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--streaming=false', @@ -53,9 +53,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN STREAMING MODE USING FLINK RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-flink_2.11"' + + switches('-Pnexmark.runner=":runners:flink:1.5"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--streaming=true', @@ -68,9 +68,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN SQL BATCH MODE USING FLINK RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-flink_2.11"' + + switches('-Pnexmark.runner=":runners:flink:1.5"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--queryLanguage=sql', @@ -83,9 +83,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN SQL STREAMING MODE USING FLINK RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-flink_2.11"' + + switches('-Pnexmark.runner=":runners:flink:1.5"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--queryLanguage=sql', diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy index 20847dc..5fb7d24 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Spark.groovy @@ -36,9 +36,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK IN BATCH MODE USING SPARK RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-spark"' + + switches('-Pnexmark.runner=":runners:spark"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=SparkRunner', @@ -51,9 +51,9 @@ NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_ shell('echo *** RUN NEXMARK SQL IN BATCH MODE USING SPARK RUNNER ***') gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-java-nexmark:run') + tasks(':sdks:java:testing:nexmark:run') commonJobProperties.setGradleSwitches(delegate) - switches('-Pnexmark.runner=":beam-runners-spark"' + + switches('-Pnexmark.runner=":runners:spark"' + ' -Pnexmark.args="' + [NexmarkBigqueryProperties.nexmarkBigQueryArgs, '--runner=SparkRunner', diff --git a/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Batch.groovy b/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Batch.groovy index 7aee97a..b8a59b3 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Batch.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Batch.groovy @@ -36,7 +36,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_PVR_Flink_Batch', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-flink_2.11-job-server:validatesPortableRunnerBatch') + tasks(':runners:flink:1.5:job-server:validatesPortableRunnerBatch') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Streaming.groovy b/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Streaming.groovy index c016a5f..6a48e31 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Streaming.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_PortableValidatesRunner_Flink_Streaming.groovy @@ -36,7 +36,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_PVR_Flink_Streaming', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-flink_2.11-job-server:validatesPortableRunnerStreaming') + tasks(':runners:flink:1.5:job-server:validatesPortableRunnerStreaming') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy index faaa7af..3cbf396 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Apex.groovy @@ -37,7 +37,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Apex', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-apex:validatesRunner') + tasks(':runners:apex:validatesRunner') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy index 7280289..530fba6 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow.groovy @@ -40,7 +40,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Dataflo steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java:validatesRunner') + tasks(':runners:google-cloud-dataflow-java:validatesRunner') // Increase parallel worker threads above processor limit since most time is // spent waiting on Dataflow jobs. ValidatesRunner tests on Dataflow are slow // because each one launches a Dataflow job with about 3 mins of overhead. diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_DataflowPortabilityExecutableStage.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_DataflowPortabilityExecutableStage.groovy index 62e7361..3826c78 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_DataflowPortabilityExecutableStage.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_DataflowPortabilityExecutableStage.groovy @@ -39,7 +39,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Dataflo steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java:validatesRunnerFnApiWorkerExecutableStageTest') + tasks(':runners:google-cloud-dataflow-java:validatesRunnerFnApiWorkerExecutableStageTest') // Increase parallel worker threads above processor limit since most time is // spent waiting on Dataflow jobs. ValidatesRunner tests on Dataflow are slow // because each one launches a Dataflow job with about 3 mins of overhead. diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow_Java11.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow_Java11.groovy index 4e6da6a..74e49b6 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow_Java11.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Dataflow_Java11.groovy @@ -34,7 +34,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java11_ValidatesRunner_Dataf steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java:validatesJava11Runner') + tasks(':runners:google-cloud-dataflow-java:validatesJava11Runner') // Increase parallel worker threads above processor limit since most time is // spent waiting on Dataflow jobs. ValidatesRunner tests on Dataflow are slow // because each one launches a Dataflow job with about 3 mins of overhead. diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct.groovy index f933652..923e9c3 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct.groovy @@ -36,7 +36,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Direct' steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-direct-java:validatesRunner') + tasks(':runners:direct-java:validatesRunner') } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct_Java11.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct_Java11.groovy index 0df2f84..5e3c8cf 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct_Java11.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Direct_Java11.groovy @@ -38,14 +38,14 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java11_ValidatesRunner_Direc steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-direct-java:shadowJar') - tasks(':beam-runners-direct-java:shadowTestJar') + tasks(':runners:direct-java:shadowJar') + tasks(':runners:direct-java:shadowTestJar') switches("-Dorg.gradle.java.home=${JAVA_8_HOME}") } gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-direct-java:validatesRunner') + tasks(':runners:direct-java:validatesRunner') switches("-Dorg.gradle.java.home=${JAVA_11_HOME}") switches('-x shadowJar') switches('-x shadowTestJar') diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy index d21ae86..2c8b212 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Flink.groovy @@ -37,7 +37,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Flink', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-flink_2.11:validatesRunner') + tasks(':runners:flink:1.5:validatesRunner') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy index 2b0dd7d..e1ef58f 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Gearpump.groovy @@ -41,7 +41,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Gearpum steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-gearpump:validatesRunner') + tasks(':runners:gearpump:validatesRunner') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_PortabilityApi_Dataflow.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_PortabilityApi_Dataflow.groovy index 587e885..54ad764 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_PortabilityApi_Dataflow.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_PortabilityApi_Dataflow.groovy @@ -40,7 +40,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Portabi steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-google-cloud-dataflow-java:validatesRunnerFnApiWorkerTest') + tasks(':runners:google-cloud-dataflow-java:validatesRunnerFnApiWorkerTest') // Increase parallel worker threads above processor limit since most time is // spent waiting on Dataflow jobs. ValidatesRunner tests on Dataflow are slow // because each one launches a Dataflow job with about 3 mins of overhead. diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy index fe08abd..c60b36a 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Samza.groovy @@ -37,7 +37,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Samza', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-samza:validatesRunner') + tasks(':runners:samza:validatesRunner') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy index 8804d0d..6dc0fcf 100644 --- a/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy +++ b/.test-infra/jenkins/job_PostCommit_Java_ValidatesRunner_Spark.groovy @@ -37,7 +37,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_ValidatesRunner_Spark', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-runners-spark:validatesRunner') + tasks(':runners:spark:validatesRunner') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy b/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy index 669a84a..55fad49 100644 --- a/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy +++ b/.test-infra/jenkins/job_PostCommit_Website_Publish.groovy @@ -33,8 +33,8 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Website_Publish', '', steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-website:clean') - tasks(':beam-website:publishWebsite') + tasks(':website:clean') + tasks(':website:publishWebsite') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PostCommit_Website_Test.groovy b/.test-infra/jenkins/job_PostCommit_Website_Test.groovy index 1abed32..d077e97 100644 --- a/.test-infra/jenkins/job_PostCommit_Website_Test.groovy +++ b/.test-infra/jenkins/job_PostCommit_Website_Test.groovy @@ -29,7 +29,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Website_Test', 'Run Full Web steps { gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-website:testWebsite -PdisableExternal=false') + tasks(':website:testWebsite -PdisableExternal=false') commonJobProperties.setGradleSwitches(delegate) } } diff --git a/.test-infra/jenkins/job_PreCommit_Python_ValidatesRunner_Flink.groovy b/.test-infra/jenkins/job_PreCommit_Python_ValidatesRunner_Flink.groovy index 3838602..3df3c97 100644 --- a/.test-infra/jenkins/job_PreCommit_Python_ValidatesRunner_Flink.groovy +++ b/.test-infra/jenkins/job_PreCommit_Python_ValidatesRunner_Flink.groovy @@ -23,7 +23,7 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( scope: this, nameBase: 'Python_PVR_Flink', - gradleTask: ':beam-sdks-python:flinkValidatesRunner', + gradleTask: ':sdks:python:flinkValidatesRunner', triggerPathPatterns: [ '^model/.*$', '^runners/core-construction-java/.*$', diff --git a/.test-infra/jenkins/job_PreCommit_Website_Stage_GCS.groovy b/.test-infra/jenkins/job_PreCommit_Website_Stage_GCS.groovy index c5cf28f..03b6c34 100644 --- a/.test-infra/jenkins/job_PreCommit_Website_Stage_GCS.groovy +++ b/.test-infra/jenkins/job_PreCommit_Website_Stage_GCS.groovy @@ -21,7 +21,7 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( scope: this, nameBase: 'Website_Stage_GCS', - gradleTask: ':beam-website:stageWebsite', + gradleTask: ':website:stageWebsite', triggerPathPatterns: ['^website/.*$'] ) builder.build { diff --git a/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy b/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy index ab02b3a..8548b15 100644 --- a/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy +++ b/.test-infra/jenkins/job_Release_Python_NightlySnapshot.groovy @@ -44,13 +44,13 @@ job('beam_Release_Python_NightlySnapshot') { // Cleanup Python directory. gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-python:clean') + tasks(':sdks:python:clean') commonJobProperties.setGradleSwitches(delegate) } // Build snapshot. gradle { rootBuildScriptDir(commonJobProperties.checkoutDir) - tasks(':beam-sdks-python:buildSnapshot') + tasks(':sdks:python:buildSnapshot') commonJobProperties.setGradleSwitches(delegate) } // Publish snapshot to a public accessible GCS directory. diff --git a/examples/kotlin/build.gradle b/examples/kotlin/build.gradle index 8049494..929d726 100644 --- a/examples/kotlin/build.gradle +++ b/examples/kotlin/build.gradle @@ -79,7 +79,7 @@ dependencies { delegate.add(runner + "PreCommit", project(path: ":examples:kotlin", configuration: "testRuntime")) } // https://issues.apache.org/jira/browse/BEAM-3583 - // apexRunnerPreCommit project(":beam-runners-apex") + // apexRunnerPreCommit project(":runners:apex") directRunnerPreCommit project(path: ":runners:direct-java", configuration: "shadow") flinkRunnerPreCommit project(":runners:flink:1.5") // TODO: Make the netty version used configurable, we add netty-all 4.1.17.Final so it appears on the classpath diff --git a/sdks/java/extensions/euphoria/README.md b/sdks/java/extensions/euphoria/README.md index e7b07cb..0d9254e 100644 --- a/sdks/java/extensions/euphoria/README.md +++ b/sdks/java/extensions/euphoria/README.md @@ -29,7 +29,7 @@ Integration of Euphoria API to Beam is in **progress** ([BEAM-3900](https://issu Euphoria is located in `dsl-euphoria` branch. To build `euphoria` subprojects use command: ``` -./gradlew :beam-sdks-java-extensions-euphoria:build +./gradlew :sdks:java:extensions:euphoria:build ``` ## Documentation diff --git a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java index 8793842..5132d2d 100644 --- a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java +++ b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/example/BeamSqlDataCatalogExample.java @@ -91,7 +91,7 @@ public class BeamSqlDataCatalogExample { "ERROR: SQL query or output file is not specified." + "To run this example:\n" + "./gradlew " - + ":beam-sdks-java-extensions-sql-datacatalog:runDataCatalogExample " + + ":sdks:java:extensions:sql:datacatalog:runDataCatalogExample " + "-PgcpProject=<project> " + "-PgcsTempRoot=<GCS temp location> " + "-PqueryString=<query> " diff --git a/sdks/python/build.gradle b/sdks/python/build.gradle index 945f6bc..a2ffd63 100644 --- a/sdks/python/build.gradle +++ b/sdks/python/build.gradle @@ -243,7 +243,7 @@ task sparkValidatesRunner() { def argString = project.mapToArgString(argMap) // Optionally specify test function names separated by space e.g.: - // ./gradlew :beam-sdks-python:sparkValidatesRunner -Ptests="test_external_transforms test_read" + // ./gradlew :sdks:python:sparkValidatesRunner -Ptests="test_external_transforms test_read" // Otherwise run all test functions under SparkRunnerTest def tests = project.hasProperty('tests') ? project.property('tests').split().collect{ "SparkRunnerTest.$it" }.join(' ') : '' diff --git a/website/src/documentation/sdks/nexmark.md b/website/src/documentation/sdks/nexmark.md index d319a00..ef919fb 100644 --- a/website/src/documentation/sdks/nexmark.md +++ b/website/src/documentation/sdks/nexmark.md @@ -618,7 +618,7 @@ Set these up first so the below command is valid Launch: ./gradlew :sdks:java:testing:nexmark:run \ - -Pnexmark.runner=":beam-runners-google-cloud-dataflow" \ + -Pnexmark.runner=":runners:google-cloud-dataflow-java" \ -Pnexmark.args=" --runner=DataflowRunner --suite=SMOKE diff --git a/website/src/roadmap/portability.md b/website/src/roadmap/portability.md index d9368ac..7c0dd2a 100644 --- a/website/src/roadmap/portability.md +++ b/website/src/roadmap/portability.md @@ -161,7 +161,7 @@ To run a basic Python wordcount (in batch mode) with embedded Flink or Spark: * Or start the Spark portable JobService endpoint: `./gradlew :runners:spark:job-server:runShadow` 3. Submit the wordcount pipeline to above endpoint: `./gradlew :sdks:python:portableWordCount -PjobEndpoint=localhost:8099 -PenvironmentType=LOOPBACK` -To run the pipeline in streaming mode (currently only supported on Flink): `./gradlew :beam-sdks-python:portableWordCount -PjobEndpoint=localhost:8099 -Pstreaming` +To run the pipeline in streaming mode (currently only supported on Flink): `./gradlew :sdks:python:portableWordCount -PjobEndpoint=localhost:8099 -Pstreaming` Please see the [Flink Runner page]({{ site.baseurl }}/documentation/runners/flink/) for more information on how to run portable pipelines on top of Flink.