Skip to content

Commit 1ea221c

Browse files
authored
MINOR: Add 4.1.0 to core system tests (#20477)
This PR updates all the core system tests to include 4.1.0. Reviewers: Chia-Ping Tsai <[email protected]>
1 parent 675552a commit 1ea221c

7 files changed

+19
-13
lines changed

tests/kafkatest/tests/client/client_compatibility_features_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from kafkatest.version import DEV_BRANCH, \
3030
LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4, LATEST_2_5, LATEST_2_6, LATEST_2_7, LATEST_2_8, \
3131
LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4, LATEST_3_5, LATEST_3_6, LATEST_3_7, \
32-
LATEST_3_8, LATEST_3_9, LATEST_4_0, KafkaVersion
32+
LATEST_3_8, LATEST_3_9, LATEST_4_0, LATEST_4_1, KafkaVersion
3333

3434
def get_broker_features(broker_version):
3535
features = {}
@@ -126,6 +126,7 @@ def invoke_compatibility_program(self, features):
126126
@parametrize(broker_version=str(LATEST_3_8), metadata_quorum=quorum.isolated_kraft)
127127
@parametrize(broker_version=str(LATEST_3_9), metadata_quorum=quorum.isolated_kraft)
128128
@parametrize(broker_version=str(LATEST_4_0), metadata_quorum=quorum.isolated_kraft)
129+
@parametrize(broker_version=str(LATEST_4_1), metadata_quorum=quorum.isolated_kraft)
129130
def run_compatibility_test(self, broker_version, metadata_quorum=quorum.zk):
130131
if self.zk:
131132
self.zk.start()

tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from kafkatest.version import DEV_BRANCH, \
2727
LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4, LATEST_2_5, LATEST_2_6, LATEST_2_7, LATEST_2_8, \
2828
LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4, LATEST_3_5, LATEST_3_6, LATEST_3_7, \
29-
LATEST_3_8, LATEST_3_9, LATEST_4_0, KafkaVersion
29+
LATEST_3_8, LATEST_3_9, LATEST_4_0, LATEST_4_1, KafkaVersion
3030

3131
class ClientCompatibilityProduceConsumeTest(ProduceConsumeValidateTest):
3232
"""
@@ -86,6 +86,7 @@ def min_cluster_size(self):
8686
@parametrize(broker_version=str(LATEST_3_8), metadata_quorum=quorum.isolated_kraft)
8787
@parametrize(broker_version=str(LATEST_3_9), metadata_quorum=quorum.isolated_kraft)
8888
@parametrize(broker_version=str(LATEST_4_0), metadata_quorum=quorum.isolated_kraft)
89+
@parametrize(broker_version=str(LATEST_4_1), metadata_quorum=quorum.isolated_kraft)
8990
def test_produce_consume(self, broker_version, metadata_quorum=quorum.zk):
9091
print("running producer_consumer_compat with broker_version = %s" % broker_version, flush=True)
9192
self.kafka.set_version(KafkaVersion(broker_version))

tests/kafkatest/tests/client/consumer_protocol_migration_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
from kafkatest.tests.verifiable_consumer_test import VerifiableConsumerTest
2121
from kafkatest.services.kafka import TopicPartition, quorum, consumer_group
2222
from kafkatest.version import LATEST_2_1, LATEST_2_3, LATEST_2_4, LATEST_2_5, \
23-
LATEST_3_2, LATEST_3_4, LATEST_3_5, LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, DEV_BRANCH, KafkaVersion
23+
LATEST_3_2, LATEST_3_4, LATEST_3_5, LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, \
24+
LATEST_4_0, LATEST_4_1, DEV_BRANCH, KafkaVersion
2425

2526
class ConsumerProtocolMigrationTest(VerifiableConsumerTest):
2627
"""
@@ -44,6 +45,7 @@ class ConsumerProtocolMigrationTest(VerifiableConsumerTest):
4445
all_consumer_versions = [LATEST_2_1, LATEST_2_3, LATEST_2_4, LATEST_2_5, \
4546
LATEST_3_2, LATEST_3_4, LATEST_3_5, LATEST_3_6, \
4647
LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, \
48+
LATEST_4_1, \
4749
DEV_BRANCH]
4850
consumer_versions_supporting_range_assignnor = [str(v) for v in all_consumer_versions]
4951
consumer_versions_supporting_static_membership = [str(v) for v in all_consumer_versions if v >= LATEST_2_3]

tests/kafkatest/tests/core/compatibility_test_new_broker_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from kafkatest.utils import is_int
2323
from kafkatest.version import LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4, LATEST_2_5, LATEST_2_6, \
2424
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, \
25-
LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, DEV_BRANCH, KafkaVersion
25+
LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, LATEST_4_1, DEV_BRANCH, KafkaVersion
2626

2727
# 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)
2828
class ClientCompatibilityTestNewBroker(ProduceConsumeValidateTest):
@@ -61,6 +61,7 @@ def setUp(self):
6161
@matrix(producer_version=[str(LATEST_3_8)], consumer_version=[str(LATEST_3_8)], compression_types=[["none"]], timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
6262
@matrix(producer_version=[str(LATEST_3_9)], consumer_version=[str(LATEST_3_9)], compression_types=[["none"]], timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
6363
@matrix(producer_version=[str(LATEST_4_0)], consumer_version=[str(LATEST_4_0)], compression_types=[["none"]], timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
64+
@matrix(producer_version=[str(LATEST_4_1)], consumer_version=[str(LATEST_4_1)], compression_types=[["none"]], timestamp_type=[str("CreateTime")], metadata_quorum=quorum.all_non_upgrade)
6465
@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)
6566
def test_compatibility(self, producer_version, consumer_version, compression_types, timestamp_type=None, metadata_quorum=quorum.zk):
6667
self.kafka = KafkaService(self.test_context, num_nodes=3, zk=None, version=DEV_BRANCH, topics={self.topic: {

tests/kafkatest/tests/core/transactions_mixed_versions_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from kafkatest.utils.transactions_utils import create_and_start_copiers
2323
from kafkatest.version import LATEST_3_3, LATEST_3_4, LATEST_3_5, \
2424
LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, \
25-
DEV_BRANCH, KafkaVersion, LATEST_STABLE_METADATA_VERSION
25+
LATEST_4_1, DEV_BRANCH, KafkaVersion, LATEST_STABLE_METADATA_VERSION
2626

2727
from ducktape.tests.test import Test
2828
from ducktape.mark import matrix
@@ -179,7 +179,7 @@ def setup_topics(self):
179179

180180
@cluster(num_nodes=8)
181181
@matrix(
182-
old_kafka_version=[str(LATEST_4_0), str(LATEST_3_9), str(LATEST_3_8), str(LATEST_3_7), str(LATEST_3_6), str(LATEST_3_5), str(LATEST_3_4), str(LATEST_3_3)],
182+
old_kafka_version=[str(LATEST_4_1), str(LATEST_4_0), str(LATEST_3_9), str(LATEST_3_8), str(LATEST_3_7), str(LATEST_3_6), str(LATEST_3_5), str(LATEST_3_4), str(LATEST_3_3)],
183183
metadata_quorum=[isolated_kraft],
184184
group_protocol=[None]
185185
)

tests/kafkatest/tests/core/transactions_upgrade_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from kafkatest.utils.transactions_utils import create_and_start_copiers
2323
from kafkatest.version import LATEST_3_3, LATEST_3_4, LATEST_3_5, \
2424
LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, \
25-
DEV_BRANCH, KafkaVersion, LATEST_STABLE_METADATA_VERSION, LATEST_STABLE_TRANSACTION_VERSION
25+
LATEST_4_1, DEV_BRANCH, KafkaVersion, LATEST_STABLE_METADATA_VERSION, LATEST_STABLE_TRANSACTION_VERSION
2626

2727
from ducktape.tests.test import Test
2828
from ducktape.mark import matrix
@@ -209,7 +209,7 @@ def setup_topics(self):
209209

210210
@cluster(num_nodes=8)
211211
@matrix(
212-
from_kafka_version=[str(LATEST_4_0), str(LATEST_3_9), str(LATEST_3_8), str(LATEST_3_7), str(LATEST_3_6), str(LATEST_3_5), str(LATEST_3_4), str(LATEST_3_3)],
212+
from_kafka_version=[str(LATEST_4_1), str(LATEST_4_0), str(LATEST_3_9), str(LATEST_3_8), str(LATEST_3_7), str(LATEST_3_6), str(LATEST_3_5), str(LATEST_3_4), str(LATEST_3_3)],
213213
metadata_quorum=[isolated_kraft],
214214
group_protocol=[None]
215215
)

tests/kafkatest/tests/core/upgrade_test.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
from kafkatest.tests.produce_consume_validate import ProduceConsumeValidateTest
2424
from kafkatest.utils import is_int
2525
from kafkatest.version import LATEST_3_4, LATEST_3_5, \
26-
LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, DEV_BRANCH, KafkaVersion, LATEST_STABLE_METADATA_VERSION
26+
LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, LATEST_4_0, \
27+
LATEST_4_1, DEV_BRANCH, KafkaVersion, LATEST_STABLE_METADATA_VERSION
2728

2829
#
2930
# Test upgrading between different KRaft versions.
@@ -163,25 +164,25 @@ def run_upgrade_downgrade(self, starting_kafka_version):
163164
assert self.kafka.check_protocol_errors(self)
164165

165166
@cluster(num_nodes=5)
166-
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(DEV_BRANCH)],
167+
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(LATEST_4_1), str(DEV_BRANCH)],
167168
metadata_quorum=[combined_kraft])
168169
def test_combined_mode_upgrade(self, from_kafka_version, metadata_quorum):
169170
self.run_upgrade(from_kafka_version)
170171

171172
@cluster(num_nodes=8)
172-
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(DEV_BRANCH)],
173+
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(LATEST_4_1), str(DEV_BRANCH)],
173174
metadata_quorum=[isolated_kraft])
174175
def test_isolated_mode_upgrade(self, from_kafka_version, metadata_quorum):
175176
self.run_upgrade(from_kafka_version)
176177

177178
@cluster(num_nodes=5)
178-
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(DEV_BRANCH)],
179+
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(LATEST_4_1), str(DEV_BRANCH)],
179180
metadata_quorum=[combined_kraft])
180181
def test_combined_mode_upgrade_downgrade(self, from_kafka_version, metadata_quorum):
181182
self.run_upgrade_downgrade(from_kafka_version)
182183

183184
@cluster(num_nodes=8)
184-
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(DEV_BRANCH)],
185+
@matrix(from_kafka_version=[str(LATEST_3_4), str(LATEST_3_5), str(LATEST_3_6), str(LATEST_3_7), str(LATEST_3_8), str(LATEST_3_9), str(LATEST_4_0), str(LATEST_4_1), str(DEV_BRANCH)],
185186
metadata_quorum=[isolated_kraft])
186187
def test_isolated_mode_upgrade_downgrade(self, from_kafka_version, metadata_quorum):
187188
self.run_upgrade_downgrade(from_kafka_version)

0 commit comments

Comments
 (0)