Merge pull request #4557 from graphcareful/wasm-ci

Temporarily disable coproc on ci
redpanda-data · May 6, 2022 · 6b92046 · 6b92046
2 parents 549b66c + 170168d
commit 6b92046
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 194 deletions.
diff --git a/src/v/coproc/tests/CMakeLists.txt b/src/v/coproc/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ set(fixture_deps
 
 rp_test(
   UNIT_TEST
-  BINARY_NAME coproc_fixture
+  BINARY_NAME coproc_fixture_unstable
   SOURCES
     ${fixture_srcs}
     retry_logic_tests.cc
@@ -32,14 +32,5 @@ rp_test(
     kafka_api_materialized_tests.cc
   DEFINITIONS BOOST_TEST_DYN_LINK
   LIBRARIES v::seastar_testing_main ${fixture_deps}
-  LABELS coproc
-  )
-
-rp_test(
-  UNIT_TEST
-  BINARY_NAME coproc_unstable_fixture
-  SOURCES ${fixture_srcs} pacemaker_unstable_tests.cc
-  DEFINITIONS BOOST_TEST_DYN_LINK
-  LIBRARIES v::seastar_testing_main ${fixture_deps}
   LABELS coproc disable_on_ci
   )
diff --git a/src/v/coproc/tests/pacemaker_unstable_tests.cc b/src/v/coproc/tests/pacemaker_unstable_tests.cc
diff --git a/tests/rptest/services/redpanda.py b/tests/rptest/services/redpanda.py
@@ -867,6 +867,15 @@ def is_up(line):
             nsr = node.account.ssh_capture("netstat -ant")
             return any([is_up(line) for line in nsr])
 
+        if wasm_service_up() is True:
+            self.logger.warn(f"Waiting for {wasm_port} to be available")
+            wait_until(
+                lambda: not wasm_service_up(),
+                timeout_sec=RedpandaService.READY_TIMEOUT_SEC,
+                err_msg=
+                f"Wasm engine server shutdown within {RedpandaService.READY_TIMEOUT_SEC}s timeout",
+                retry_on_exc=True)
+
         def start_wasm_service():
             node.account.ssh(wcmd)
 
@@ -1130,6 +1139,7 @@ def clean(self, **kwargs):
 
     def clean_node(self, node, preserve_logs=False):
         node.account.kill_process("redpanda", clean_shutdown=False)
+        node.account.kill_process("bin/node", clean_shutdown=False)
         if node.account.exists(RedpandaService.PERSISTENT_ROOT):
             if node.account.sftp_client.listdir(
                     RedpandaService.PERSISTENT_ROOT):

diff --git a/tests/rptest/test_suite_quick.yml b/tests/rptest/test_suite_quick.yml
@@ -13,3 +13,7 @@ quick:
 
   excluded:
   - tests/librdkafka_test.py
+  - tests/wasm_topics_test.py
+  - tests/wasm_identity_test.py
+  - tests/wasm_partition_movement_test.py
+  - tests/wasm_redpanda_failure_recovery_test.py
diff --git a/tests/rptest/tests/wasm_topics_test.py b/tests/rptest/tests/wasm_topics_test.py
@@ -47,39 +47,3 @@ def rpk_partition_sort(p):
             if output != test_cfg:
                 raise Exception("Bad config, expected: %s observed: %s" %
                                 (test_cfg, output))
-
-
-class WasmDeleteTopicsTest(WasmIdentityTest):
-    def __init__(self, test_context, num_records=10, record_size=1024):
-        super(WasmDeleteTopicsTest, self).__init__(test_context,
-                                                   extra_rp_conf=None,
-                                                   num_records=num_records,
-                                                   record_size=record_size)
-
-    def wasm_test_plan(self):
-        return [
-            WasmScript(inputs=self.wasm_test_input(),
-                       outputs=["output_1", "output_2", "output_3"],
-                       script=WasmTemplateRepository.IDENTITY_TRANSFORM)
-        ]
-
-    @ok_to_fail  # https://github.com/redpanda-data/redpanda/issues/3745
-    @cluster(num_nodes=4)
-    def verify_materialized_topics_test(self):
-        super().verify_materialized_topics_test()
-
-        for topic in self.wasm_test_output():
-            self._rpk_tool.delete_topic(topic)
-        self._rpk_tool.delete_topic(self.topic)
-
-        topics = self._rpk_tool.list_topics()
-
-        for topic in self.wasm_test_output():
-            if topic in topics:
-                raise Exception(
-                    'Failed to delete materialized topic %s - topics: %s' %
-                    (topic, topics))
-
-        if self.topic in topics:
-            raise Exception('Failed to delete source topic: %s - topics: %s' %
-                            (self.topic, topics))