This is an automated email from the ASF dual-hosted git repository. goenka 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 1a217db [BEAM-9707] Hardcode Unified harness image for fixing dataflow VR 2 tests new 1f48ac6 Merge pull request #11326 from angoenka/uw_image 1a217db is described below commit 1a217db81a7fa6ffabfd48b292e131fc5c7c5eec Author: Ankur Goenka <ankurgoe...@gmail.com> AuthorDate: Mon Apr 6 14:25:49 2020 -0700 [BEAM-9707] Hardcode Unified harness image for fixing dataflow VR 2 tests --- .../python/apache_beam/runners/dataflow/internal/apiclient.py | 11 +++++++++++ sdks/python/scripts/run_integration_test.sh | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py index 8b4e169..71cd0cc 100644 --- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py +++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py @@ -196,6 +196,17 @@ class Environment(object): # TODO: Use enumerated type instead of strings for job types. if job_type.startswith('FNAPI_'): self.debug_options.experiments = self.debug_options.experiments or [] + + # TODO(BEAM-9707) : Remove hardcoding runner_harness_container for + # Unified worker. + if _use_unified_worker( + options) and not self.debug_options.lookup_experiment( + 'runner_harness_container_image' + ) and 'dev' in beam_version.__version__: + self.debug_options.add_experiment( + 'runner_harness_container_image=' + 'gcr.io/cloud-dataflow/v1beta3/unified-harness:20200402-rc00') + if self.debug_options.lookup_experiment( 'runner_harness_container_image') or _use_unified_worker(options): # Default image is not used if user provides a runner harness image. diff --git a/sdks/python/scripts/run_integration_test.sh b/sdks/python/scripts/run_integration_test.sh index 386bb42..b41e9e8 100755 --- a/sdks/python/scripts/run_integration_test.sh +++ b/sdks/python/scripts/run_integration_test.sh @@ -232,8 +232,6 @@ if [[ -z $PIPELINE_OPTS ]]; then # Add --runner_v2 if provided if [[ "$RUNNER_V2" = true ]]; then opts+=("--experiments=use_runner_v2") - # Cleanup jira BEAM-9391 - opts+=("--experiments=runner_harness_container_image=gcr.io/cloud-dataflow/v1beta3/unified-harness:20200227-rc01") if [[ "$STREAMING" = true ]]; then # Dataflow Runner V2 only supports streaming engine. opts+=("--enable_streaming_engine")