[beam] branch master updated: [BEAM-7347] Pass dpb_service_zone flag to benchmarks to fix breakage

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markliu 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 42ada03  [BEAM-7347] Pass dpb_service_zone flag to benchmarks to fix breakage
     new 15deadf  Merge pull request #8602 from markflyhigh/fix-perf
42ada03 is described below

commit 42ada03f5758ff17d203add68c389194bde6581e
Author: Mark Liu <ma...@google.com>
AuthorDate: Fri May 17 10:11:21 2019 -0700

    [BEAM-7347] Pass dpb_service_zone flag to benchmarks to fix breakage
---
 .test-infra/jenkins/CommonJobProperties.groovy | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.test-infra/jenkins/CommonJobProperties.groovy b/.test-infra/jenkins/CommonJobProperties.groovy
index cb4a4eb..2dddaad 100644
--- a/.test-infra/jenkins/CommonJobProperties.groovy
+++ b/.test-infra/jenkins/CommonJobProperties.groovy
@@ -236,13 +236,19 @@ class CommonJobProperties {
       project: 'apache-beam-testing',
       dpb_log_level: 'INFO',
       bigquery_table: 'beam_performance.pkb_results',
-      k8s_get_retry_count: 36, // wait up to 6 minutes for K8s LoadBalancer
+      // wait up to 6 minutes for K8s LoadBalancer
+      k8s_get_retry_count: 36,
       k8s_get_wait_interval: 10,
       temp_dir: '$WORKSPACE',
       // Use source cloned by Jenkins and not clone it second time (redundantly).
       beam_location: '$WORKSPACE/src',
       // Publishes results with official tag, for use in dashboards.
-      official: 'true'
+      official: 'true',
+      // dpb_service_zone is required in Perfkit BaseDpbService which Beam Perfkit benchmarks
+      // depends on. However, it doesn't get used in Beam. Passing a fake value from here is to
+      // avoid breakage.
+      // TODO(BEAM-7347): Remove this flag after dpb_service_zone is not required.
+      dpb_service_zone: 'fake_zone',
     ]
     // Note: in case of key collision, keys present in ArgMap win.
     LinkedHashMap<String, String> joinedArgs = standardArgs.plus(argMap)