You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2022/11/28 15:15:23 UTC

[beam] branch master updated: Get postcommits green and unsickbay (#24342)

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

damccorm 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 6dc4b73ff0b Get postcommits green and unsickbay (#24342)
6dc4b73ff0b is described below

commit 6dc4b73ff0b595798415540f3da219cef858d585
Author: Danny McCormick <da...@google.com>
AuthorDate: Mon Nov 28 10:15:16 2022 -0500

    Get postcommits green and unsickbay (#24342)
    
    go test
---
 .test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy        | 1 -
 sdks/go/test/integration/integration.go                                | 2 --
 sdks/python/apache_beam/examples/complete/tfidf_it_test.py             | 1 +
 .../apache_beam/examples/cookbook/bigquery_side_input_it_test.py       | 1 +
 sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py        | 1 +
 .../python/apache_beam/examples/cookbook/multiple_output_pardo_test.py | 1 +
 sdks/python/test-suites/portable/common.gradle                         | 3 ---
 7 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
index c1a44b8e9d4..779395bf709 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
@@ -37,7 +37,6 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Python_Examples_Flink',
         gradle {
           rootBuildScriptDir(commonJobProperties.checkoutDir)
           tasks(":sdks:python:test-suites:portable:flinkExamplesPostCommit")
-          switches("-PflinkConfDir=$WORKSPACE/src/runners/flink/src/test/resources")
           commonJobProperties.setGradleSwitches(delegate)
         }
       }
diff --git a/sdks/go/test/integration/integration.go b/sdks/go/test/integration/integration.go
index 26acc5137e6..2253df597bb 100644
--- a/sdks/go/test/integration/integration.go
+++ b/sdks/go/test/integration/integration.go
@@ -137,8 +137,6 @@ var portableFilters = []string{
 var flinkFilters = []string{
 	// TODO(https://github.com/apache/beam/issues/20723): Flink tests timing out on reads.
 	"TestXLang_Combine.*",
-	// TODO(https://github.com/apache/beam/issues/21094): Test fails on post commits: "Insufficient number of network buffers".
-	"TestXLang_Multi",
 	"TestDebeziumIO_BasicRead",
 	// TODO(BEAM-13215): GCP IOs currently do not work in non-Dataflow portable runners.
 	"TestBigQueryIO.*",
diff --git a/sdks/python/apache_beam/examples/complete/tfidf_it_test.py b/sdks/python/apache_beam/examples/complete/tfidf_it_test.py
index fe1649bbfa3..3ecbd0c1eca 100644
--- a/sdks/python/apache_beam/examples/complete/tfidf_it_test.py
+++ b/sdks/python/apache_beam/examples/complete/tfidf_it_test.py
@@ -42,6 +42,7 @@ EXPECTED_LINE_RE = r'\(u?\'([a-z]*)\', \(\'.*([0-9]\.txt)\', (.*)\)\)'
 
 class TfIdfIT(unittest.TestCase):
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_basics(self):
     test_pipeline = TestPipeline(is_integration_test=True)
 
diff --git a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py
index 1f58e82e47d..bce8584db21 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py
@@ -45,6 +45,7 @@ class BigQuerySideInputIT(unittest.TestCase):
 
   @pytest.mark.no_xdist
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_bigquery_side_input_it(self):
     state_verifier = PipelineStateMatcher(PipelineState.DONE)
     NUM_GROUPS = 3
diff --git a/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py b/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
index e996084b81c..a53318a94a8 100644
--- a/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
@@ -136,6 +136,7 @@ class MergeContactsTest(unittest.TestCase):
     return '\n'.join(sorted(lines_out)) + '\n'
 
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_mergecontacts(self):
     test_pipeline = TestPipeline(is_integration_test=True)
 
diff --git a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
index 706cff70ba7..d4f540163a3 100644
--- a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
@@ -49,6 +49,7 @@ class MultipleOutputParDo(unittest.TestCase):
     return results
 
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_multiple_output_pardo(self):
     test_pipeline = TestPipeline(is_integration_test=True)
 
diff --git a/sdks/python/test-suites/portable/common.gradle b/sdks/python/test-suites/portable/common.gradle
index 9585d092204..c87696793f0 100644
--- a/sdks/python/test-suites/portable/common.gradle
+++ b/sdks/python/test-suites/portable/common.gradle
@@ -317,9 +317,6 @@ project.tasks.register("postCommitPy${pythonVersionSuffix}IT") {
             // suppress metric name collision warning logs
             '\\"org.apache.flink.runtime.metrics.groups\\":\\"ERROR\\"}'
     ]
-    if (project.hasProperty('flinkConfDir')) {
-      pipelineOpts += ["--flink-conf-dir=${project.property('flinkConfDir')}"]
-    }
     def cmdArgs = mapToArgString([
             "test_opts": testOpts,
             "suite": "postCommitIT-flink-py${pythonVersionSuffix}",