diff --git a/gradle.properties b/gradle.properties index ab3021778e..fa3aeb99c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ group=org.apache.kafka # - tests/kafkatest/__init__.py # - tests/kafkatest/version.py (variable DEV_VERSION) # - kafka-merge-pr.py -version=1.0.0 +version=3.4.0 scalaVersion=2.13.10 task=build org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py index d9b4b1c0f8..56ee45dcc6 100644 --- a/tests/kafkatest/__init__.py +++ b/tests/kafkatest/__init__.py @@ -22,4 +22,4 @@ # Instead, in development branches, the version should have a suffix of the form ".devN" # # For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0" -__version__ = '1.0.0' +__version__ = '3.4.0' diff --git a/tests/kafkatest/tests/streams/streams_application_upgrade_test.py b/tests/kafkatest/tests/streams/streams_application_upgrade_test.py index 8144b31229..204a4d358b 100644 --- a/tests/kafkatest/tests/streams/streams_application_upgrade_test.py +++ b/tests/kafkatest/tests/streams/streams_application_upgrade_test.py @@ -14,7 +14,7 @@ # limitations under the License. import random -from ducktape.mark import matrix +from ducktape.mark import matrix, ignore from ducktape.mark.resource import cluster from ducktape.tests.test import Test from ducktape.utils.util import wait_until @@ -55,6 +55,7 @@ def perform_broker_upgrade(self, to_version): node.version = KafkaVersion(to_version) self.kafka.start_node(node) + @ignore # Directly upgrade from local mode to AutoMQ is unsupported @cluster(num_nodes=6) @matrix(from_version=smoke_test_versions, to_version=dev_version, bounce_type=["full"]) def test_app_upgrade(self, from_version, to_version, bounce_type): diff --git a/tests/kafkatest/tests/streams/streams_broker_bounce_test.py b/tests/kafkatest/tests/streams/streams_broker_bounce_test.py index c5fdfcf874..9a8d3b13e4 100644 --- a/tests/kafkatest/tests/streams/streams_broker_bounce_test.py +++ b/tests/kafkatest/tests/streams/streams_broker_bounce_test.py @@ -212,16 +212,16 @@ def collect_results(self, sleep_time_secs): return data @cluster(num_nodes=7) - @matrix(failure_mode=["clean_shutdown", "hard_shutdown", "clean_bounce", "hard_bounce"], + @matrix(failure_mode=["clean_shutdown", "clean_bounce", "hard_bounce"], broker_type=["leader"], num_threads=[1, 3], sleep_time_secs=[120], metadata_quorum=[quorum.remote_kraft]) - @matrix(failure_mode=["clean_shutdown", "hard_shutdown", "clean_bounce", "hard_bounce"], - broker_type=["leader", "controller"], - num_threads=[1, 3], - sleep_time_secs=[120], - metadata_quorum=[quorum.zk]) + # @matrix(failure_mode=["clean_shutdown", "hard_shutdown", "clean_bounce", "hard_bounce"], + # broker_type=["leader", "controller"], + # num_threads=[1, 3], + # sleep_time_secs=[120], + # metadata_quorum=[quorum.zk]) def test_broker_type_bounce(self, failure_mode, broker_type, sleep_time_secs, num_threads, metadata_quorum): """ Start a smoke test client, then kill one particular broker and ensure data is still received @@ -262,6 +262,8 @@ def test_broker_type_bounce_at_start(self, failure_mode, broker_type, sleep_time return self.collect_results(sleep_time_secs) + # AutoMQ E2E need clean shutdown, the test case is duplicated to test_all_brokers_bounce + @ignore @cluster(num_nodes=7) @matrix(failure_mode=["clean_shutdown", "hard_shutdown", "clean_bounce", "hard_bounce"], num_failures=[2], @@ -282,9 +284,13 @@ def test_many_brokers_bounce(self, failure_mode, num_failures, metadata_quorum=q return self.collect_results(120) @cluster(num_nodes=7) - @matrix(failure_mode=["clean_bounce", "hard_bounce"], - num_failures=[3], + @matrix(failure_mode=["clean_shutdown"], + num_failures=[1], metadata_quorum=quorum.all_non_upgrade) + # AutoMQ E2E need clean shutdown + # @matrix(failure_mode=["clean_bounce", "hard_bounce"], + # num_failures=[3], + # metadata_quorum=quorum.all_non_upgrade) def test_all_brokers_bounce(self, failure_mode, num_failures, metadata_quorum=quorum.zk): """ Start a smoke test client, then kill a few brokers and ensure data is still received diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py b/tests/kafkatest/tests/streams/streams_upgrade_test.py index ec47f61c62..2b63214134 100644 --- a/tests/kafkatest/tests/streams/streams_upgrade_test.py +++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py @@ -195,6 +195,7 @@ def test_upgrade_downgrade_brokers(self, from_version, to_version): processor.stop() processor.node.account.ssh_capture("grep SMOKE-TEST-CLIENT-CLOSED %s" % processor.STDOUT_FILE, allow_fail=False) + @ignore # Directly upgrade from local mode to AutoMQ is unsupported @cluster(num_nodes=6) @matrix(from_version=metadata_1_versions, to_version=[str(DEV_VERSION)]) @matrix(from_version=metadata_2_versions, to_version=[str(DEV_VERSION)]) diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py index 83d5755556..692b75b50f 100644 --- a/tests/kafkatest/version.py +++ b/tests/kafkatest/version.py @@ -119,7 +119,7 @@ def get_version(node=None): return DEV_BRANCH DEV_BRANCH = KafkaVersion("dev") -DEV_VERSION = KafkaVersion("1.0.0-SNAPSHOT") +DEV_VERSION = KafkaVersion("3.4.0") LATEST_METADATA_VERSION = "3.3"