This is an automated email from the ASF dual-hosted git repository. altay 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 4d729e6 [BEAM-6619] Add PostCommit sutie for Py3 ITs on DataflowRunner (#7756) 4d729e6 is described below commit 4d729e667623c011e23d205457fcb029271e6b37 Author: Mark Liu <mark...@google.com> AuthorDate: Thu Feb 7 14:52:16 2019 -0800 [BEAM-6619] Add PostCommit sutie for Py3 ITs on DataflowRunner (#7756) * [BEAM-6619] Add PostCommit sutie for Py3 ITs on DataflowRunner --- build.gradle | 2 -- sdks/python/build.gradle | 3 +++ sdks/python/precommit/dataflow/build.gradle | 2 +- sdks/python/precommit/{direct => dataflow}/py3/build.gradle | 9 +++------ sdks/python/precommit/direct/py3/build.gradle | 2 +- settings.gradle | 2 ++ 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 5926135..8202b82 100644 --- a/build.gradle +++ b/build.gradle @@ -240,8 +240,6 @@ task goIntegrationTests() { task pythonPreCommit() { dependsOn ":beam-sdks-python:preCommit" - dependsOn ":beam-sdks-python-precommit-dataflow:precommitIT" - dependsOn ":beam-sdks-python-precommit-direct-py3:precommitIT" } task pythonPostCommit() { diff --git a/sdks/python/build.gradle b/sdks/python/build.gradle index 2ca0119..78177c0 100644 --- a/sdks/python/build.gradle +++ b/sdks/python/build.gradle @@ -111,6 +111,8 @@ task preCommit() { dependsOn "testPy2Gcp" dependsOn "testPy3Gcp" dependsOn "lint" + dependsOn ":beam-sdks-python-precommit-dataflow:preCommitIT" + dependsOn ":beam-sdks-python-precommit-direct-py3:preCommitIT" } task portablePreCommit() { @@ -386,6 +388,7 @@ task postCommit() { dependsOn "directRunnerIT" dependsOn "hdfsIntegrationTest" dependsOn "postCommitIT" + dependsOn ":beam-sdks-python-precommit-dataflow-py3:preCommitIT" } diff --git a/sdks/python/precommit/dataflow/build.gradle b/sdks/python/precommit/dataflow/build.gradle index ff6da9a..59072b7 100644 --- a/sdks/python/precommit/dataflow/build.gradle +++ b/sdks/python/precommit/dataflow/build.gradle @@ -21,7 +21,7 @@ applyPythonNature() def runScriptsDir = "${project.rootDir}/sdks/python/scripts" -task precommitIT(dependsOn: ['sdist', 'installGcpTest']) { +task preCommitIT(dependsOn: ['sdist', 'installGcpTest']) { doLast { // Basic integration tests to run in PreCommit def precommitTests = [ diff --git a/sdks/python/precommit/direct/py3/build.gradle b/sdks/python/precommit/dataflow/py3/build.gradle similarity index 80% copy from sdks/python/precommit/direct/py3/build.gradle copy to sdks/python/precommit/dataflow/py3/build.gradle index bc46e47..b73e55d 100644 --- a/sdks/python/precommit/direct/py3/build.gradle +++ b/sdks/python/precommit/dataflow/py3/build.gradle @@ -24,19 +24,16 @@ project.ext.python3 = true def runScriptsDir = "${project.rootDir}/sdks/python/scripts" -task precommitIT(dependsOn: ['sdist', 'installGcpTest']) { - // Run IT tests with TestDirectRunner in batch in Python 3. +task preCommitIT(dependsOn: ['sdist', 'installGcpTest']) { doLast { def testOpts = [ "--tests=apache_beam.examples.wordcount_it_test:WordCountIT.test_wordcount_it", "--nocapture", // Print stdout instantly ] - def argMap = ["runner": "TestDirectRunner", - "test_opts": testOpts] - def batchCmdArgs = project.mapToArgString(argMap) + def cmdArgs = project.mapToArgString(["test_opts": testOpts]) exec { executable 'sh' - args '-c', ". ${project.ext.envdir}/bin/activate && ${runScriptsDir}/run_integration_test.sh $batchCmdArgs" + args '-c', ". ${project.ext.envdir}/bin/activate && ${runScriptsDir}/run_integration_test.sh $cmdArgs" } } } diff --git a/sdks/python/precommit/direct/py3/build.gradle b/sdks/python/precommit/direct/py3/build.gradle index bc46e47..d28ce7b 100644 --- a/sdks/python/precommit/direct/py3/build.gradle +++ b/sdks/python/precommit/direct/py3/build.gradle @@ -24,7 +24,7 @@ project.ext.python3 = true def runScriptsDir = "${project.rootDir}/sdks/python/scripts" -task precommitIT(dependsOn: ['sdist', 'installGcpTest']) { +task preCommitIT(dependsOn: ['sdist', 'installGcpTest']) { // Run IT tests with TestDirectRunner in batch in Python 3. doLast { def testOpts = [ diff --git a/settings.gradle b/settings.gradle index 1117c64..f62eae3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -207,6 +207,8 @@ include "beam-sdks-python-container-py3" project(":beam-sdks-python-container-py3").dir = file("sdks/python/container/py3") include "beam-sdks-python-precommit-dataflow" project(":beam-sdks-python-precommit-dataflow").dir = file("sdks/python/precommit/dataflow") +include "beam-sdks-python-precommit-dataflow-py3" +project(":beam-sdks-python-precommit-dataflow-py3").dir = file("sdks/python/precommit/dataflow/py3") include "beam-sdks-python-precommit-direct-py3" project(":beam-sdks-python-precommit-direct-py3").dir = file("sdks/python/precommit/direct/py3") include "beam-vendor-grpc-1_13_1"