This is an automated email from the ASF dual-hosted git repository.
satishd pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new cc951e3f817 KAFKA-15593: Add 3.6 to core upgrade and compatibility
tests (#14527)
cc951e3f817 is described below
commit cc951e3f8175b9ad2c785e4058d4a9765aceb682
Author: Satish Duggana <[email protected]>
AuthorDate: Fri Oct 13 08:21:34 2023 -0700
KAFKA-15593: Add 3.6 to core upgrade and compatibility tests (#14527)
Reviewers: Christo Lolov <[email protected]>, Josep Prat
<[email protected]>
---
tests/kafkatest/tests/client/client_compatibility_features_test.py | 4 +++-
.../tests/client/client_compatibility_produce_consume_test.py | 3 ++-
tests/kafkatest/tests/core/compatibility_test_new_broker_test.py | 4 +++-
tests/kafkatest/tests/core/downgrade_test.py | 6 +++++-
tests/kafkatest/tests/core/upgrade_test.py | 7 +++++--
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/tests/kafkatest/tests/client/client_compatibility_features_test.py
b/tests/kafkatest/tests/client/client_compatibility_features_test.py
index 20982973ca3..b82122b3cdb 100644
--- a/tests/kafkatest/tests/client/client_compatibility_features_test.py
+++ b/tests/kafkatest/tests/client/client_compatibility_features_test.py
@@ -28,7 +28,8 @@ from kafkatest.services.kafka import KafkaService, quorum
from ducktape.tests.test import Test
from kafkatest.version import DEV_BRANCH, LATEST_0_10_0, LATEST_0_10_1,
LATEST_0_10_2, LATEST_0_11_0, LATEST_1_0, \
LATEST_1_1, LATEST_2_0, LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4,
LATEST_2_5, LATEST_2_6, LATEST_2_7, \
- LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4,
LATEST_3_5, V_0_11_0_0, V_0_10_1_0, KafkaVersion
+ LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4,
LATEST_3_5, LATEST_3_6, V_0_11_0_0, \
+ V_0_10_1_0, KafkaVersion
def get_broker_features(broker_version):
features = {}
@@ -138,6 +139,7 @@ class ClientCompatibilityFeaturesTest(Test):
@parametrize(broker_version=str(LATEST_3_3))
@parametrize(broker_version=str(LATEST_3_4))
@parametrize(broker_version=str(LATEST_3_5))
+ @parametrize(broker_version=str(LATEST_3_6))
def run_compatibility_test(self, broker_version,
metadata_quorum=quorum.zk):
if self.zk:
self.zk.start()
diff --git
a/tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py
b/tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py
index 07c728bec75..33df4d2fdce 100644
--- a/tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py
+++ b/tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py
@@ -25,7 +25,7 @@ from kafkatest.tests.produce_consume_validate import
ProduceConsumeValidateTest
from kafkatest.utils import is_int_with_prefix
from kafkatest.version import DEV_BRANCH, LATEST_0_10_0, LATEST_0_10_1,
LATEST_0_10_2, LATEST_0_11_0, LATEST_1_0, \
LATEST_1_1, LATEST_2_0, LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4,
LATEST_2_5, LATEST_2_6, LATEST_2_7, \
- LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4,
LATEST_3_5, KafkaVersion
+ LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4,
LATEST_3_5, LATEST_3_6, KafkaVersion
class ClientCompatibilityProduceConsumeTest(ProduceConsumeValidateTest):
"""
@@ -79,6 +79,7 @@ class
ClientCompatibilityProduceConsumeTest(ProduceConsumeValidateTest):
@parametrize(broker_version=str(LATEST_3_3))
@parametrize(broker_version=str(LATEST_3_4))
@parametrize(broker_version=str(LATEST_3_5))
+ @parametrize(broker_version=str(LATEST_3_6))
def test_produce_consume(self, broker_version, metadata_quorum=quorum.zk):
print("running producer_consumer_compat with broker_version = %s" %
broker_version, flush=True)
self.kafka.set_version(KafkaVersion(broker_version))
diff --git a/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py
b/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py
index 4d2e2474146..6d25b0b8e07 100644
--- a/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py
+++ b/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py
@@ -23,7 +23,8 @@ from kafkatest.tests.produce_consume_validate import
ProduceConsumeValidateTest
from kafkatest.utils import is_int
from kafkatest.version import LATEST_0_8_2, LATEST_0_9, LATEST_0_10_0,
LATEST_0_10_1, LATEST_0_10_2, LATEST_0_11_0, \
LATEST_1_0, LATEST_1_1, LATEST_2_0, LATEST_2_1, LATEST_2_2, LATEST_2_3,
LATEST_2_4, LATEST_2_5, LATEST_2_6, \
- LATEST_2_7, LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3,
LATEST_3_4, LATEST_3_5, DEV_BRANCH, KafkaVersion
+ LATEST_2_7, LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3,
LATEST_3_4, LATEST_3_5, LATEST_3_6, \
+ DEV_BRANCH, KafkaVersion
# Compatibility tests for moving to a new broker (e.g., 0.10.x) and using a
mix of old and new clients (e.g., 0.9.x)
class ClientCompatibilityTestNewBroker(ProduceConsumeValidateTest):
@@ -62,6 +63,7 @@ class
ClientCompatibilityTestNewBroker(ProduceConsumeValidateTest):
@matrix(producer_version=[str(LATEST_3_3)],
consumer_version=[str(LATEST_3_3)], compression_types=[["none"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
@matrix(producer_version=[str(LATEST_3_4)],
consumer_version=[str(LATEST_3_4)], compression_types=[["none"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
@matrix(producer_version=[str(LATEST_3_5)],
consumer_version=[str(LATEST_3_5)], compression_types=[["none"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
+ @matrix(producer_version=[str(LATEST_3_6)],
consumer_version=[str(LATEST_3_6)], compression_types=[["none"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
@matrix(producer_version=[str(LATEST_2_1)],
consumer_version=[str(LATEST_2_1)], compression_types=[["zstd"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
@matrix(producer_version=[str(LATEST_2_0)],
consumer_version=[str(LATEST_2_0)], compression_types=[["snappy"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
@matrix(producer_version=[str(LATEST_1_1)],
consumer_version=[str(LATEST_1_1)], compression_types=[["lz4"]],
timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
diff --git a/tests/kafkatest/tests/core/downgrade_test.py
b/tests/kafkatest/tests/core/downgrade_test.py
index 14e37bbc976..afdb009c5ef 100644
--- a/tests/kafkatest/tests/core/downgrade_test.py
+++ b/tests/kafkatest/tests/core/downgrade_test.py
@@ -20,7 +20,8 @@ from ducktape.utils.util import wait_until
from kafkatest.services.kafka import config_property
from kafkatest.tests.end_to_end import EndToEndTest
from kafkatest.version import LATEST_1_1, LATEST_2_0, LATEST_2_1, LATEST_2_2,
LATEST_2_3, LATEST_2_4, LATEST_2_5, \
- LATEST_2_6, LATEST_2_7, LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2,
LATEST_3_3, LATEST_3_4, LATEST_3_5, DEV_BRANCH, KafkaVersion
+ LATEST_2_6, LATEST_2_7, LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2,
LATEST_3_3, LATEST_3_4, LATEST_3_5, \
+ LATEST_3_6, DEV_BRANCH, KafkaVersion
class TestDowngrade(EndToEndTest):
PARTITIONS = 3
@@ -80,6 +81,9 @@ class TestDowngrade(EndToEndTest):
timeout_sec=60, backoff_sec=1, err_msg="Replicas did not
rejoin the ISR in a reasonable amount of time")
@cluster(num_nodes=7)
+ @parametrize(version=str(LATEST_3_6), compression_types=["snappy"])
+ @parametrize(version=str(LATEST_3_6), compression_types=["zstd"],
security_protocol="SASL_SSL")
+ @matrix(version=[str(LATEST_3_6)], compression_types=[["none"]],
static_membership=[False, True])
@parametrize(version=str(LATEST_3_5), compression_types=["snappy"])
@parametrize(version=str(LATEST_3_5), compression_types=["zstd"],
security_protocol="SASL_SSL")
@matrix(version=[str(LATEST_3_5)], compression_types=[["none"]],
static_membership=[False, True])
diff --git a/tests/kafkatest/tests/core/upgrade_test.py
b/tests/kafkatest/tests/core/upgrade_test.py
index 1392912b8b3..62855b78c87 100644
--- a/tests/kafkatest/tests/core/upgrade_test.py
+++ b/tests/kafkatest/tests/core/upgrade_test.py
@@ -26,8 +26,8 @@ from kafkatest.utils import is_int
from kafkatest.utils.remote_account import java_version
from kafkatest.version import LATEST_0_8_2, LATEST_0_9, LATEST_0_10,
LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, \
LATEST_0_11_0, LATEST_1_0, LATEST_1_1, LATEST_2_0, LATEST_2_1, LATEST_2_2,
LATEST_2_3, LATEST_2_4, LATEST_2_5, \
- LATEST_2_6, LATEST_2_7, LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2,
LATEST_3_3, LATEST_3_4, LATEST_3_5, V_0_11_0_0, V_2_8_0, V_3_0_0, \
- DEV_BRANCH, KafkaVersion
+ LATEST_2_6, LATEST_2_7, LATEST_2_8, LATEST_3_0, LATEST_3_1, LATEST_3_2,
LATEST_3_3, LATEST_3_4, LATEST_3_5, \
+ LATEST_3_6, V_0_11_0_0, V_2_8_0, V_3_0_0, DEV_BRANCH, KafkaVersion
from kafkatest.services.kafka.util import new_jdk_not_supported
class TestUpgrade(ProduceConsumeValidateTest):
@@ -94,6 +94,9 @@ class TestUpgrade(ProduceConsumeValidateTest):
self.wait_until_rejoin()
@cluster(num_nodes=6)
+ @parametrize(from_kafka_version=str(LATEST_3_6),
to_message_format_version=None, compression_types=["none"])
+ @parametrize(from_kafka_version=str(LATEST_3_6),
to_message_format_version=None, compression_types=["lz4"])
+ @parametrize(from_kafka_version=str(LATEST_3_6),
to_message_format_version=None, compression_types=["snappy"])
@parametrize(from_kafka_version=str(LATEST_3_5),
to_message_format_version=None, compression_types=["none"])
@parametrize(from_kafka_version=str(LATEST_3_5),
to_message_format_version=None, compression_types=["lz4"])
@parametrize(from_kafka_version=str(LATEST_3_5),
to_message_format_version=None, compression_types=["snappy"])
