You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by rn...@apache.org on 2023/07/27 20:12:32 UTC

[kafka] branch trunk updated: [MINOR] Add latest versions to kraft upgrade kafkatest (#14084)

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

rndgstn 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 e5861eeaae0 [MINOR] Add latest versions to kraft upgrade kafkatest (#14084)
e5861eeaae0 is described below

commit e5861eeaae0fabca28e7a512ebc487438eab2bad
Author: Alyssa Huang <ah...@confluent.io>
AuthorDate: Thu Jul 27 13:12:25 2023 -0700

    [MINOR] Add latest versions to kraft upgrade kafkatest (#14084)
    
    Reviewers: Ron Dagostino <rn...@gmail.com>
---
 tests/kafkatest/tests/core/kraft_upgrade_test.py | 12 ++++++++++--
 tests/kafkatest/version.py                       |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/kafkatest/tests/core/kraft_upgrade_test.py b/tests/kafkatest/tests/core/kraft_upgrade_test.py
index df28795075a..7a3bc87ad1d 100644
--- a/tests/kafkatest/tests/core/kraft_upgrade_test.py
+++ b/tests/kafkatest/tests/core/kraft_upgrade_test.py
@@ -22,8 +22,8 @@ from kafkatest.services.kafka.quorum import isolated_kraft, combined_kraft
 from kafkatest.services.verifiable_producer import VerifiableProducer
 from kafkatest.tests.produce_consume_validate import ProduceConsumeValidateTest
 from kafkatest.utils import is_int
-from kafkatest.version import LATEST_3_0, LATEST_3_1, LATEST_3_2, DEV_BRANCH, \
-    KafkaVersion, LATEST_METADATA_VERSION
+from kafkatest.version import LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4, LATEST_3_5, \
+    DEV_BRANCH, DEV_VERSION, KafkaVersion, LATEST_METADATA_VERSION
 
 #
 # Test upgrading between different KRaft versions.
@@ -111,12 +111,20 @@ class TestKRaftUpgrade(ProduceConsumeValidateTest):
     @cluster(num_nodes=5)
     @parametrize(from_kafka_version=str(LATEST_3_1), metadata_quorum=combined_kraft)
     @parametrize(from_kafka_version=str(LATEST_3_2), metadata_quorum=combined_kraft)
+    @parametrize(from_kafka_version=str(LATEST_3_3), metadata_quorum=combined_kraft)
+    @parametrize(from_kafka_version=str(LATEST_3_4), metadata_quorum=combined_kraft)
+    @parametrize(from_kafka_version=str(LATEST_3_5), metadata_quorum=combined_kraft)
+    @parametrize(from_kafka_version=str(DEV_VERSION), metadata_quorum=combined_kraft)
     def test_combined_mode_upgrade(self, from_kafka_version, metadata_quorum):
         self.run_upgrade(from_kafka_version)
 
     @cluster(num_nodes=8)
     @parametrize(from_kafka_version=str(LATEST_3_1), metadata_quorum=isolated_kraft)
     @parametrize(from_kafka_version=str(LATEST_3_2), metadata_quorum=isolated_kraft)
+    @parametrize(from_kafka_version=str(LATEST_3_3), metadata_quorum=isolated_kraft)
+    @parametrize(from_kafka_version=str(LATEST_3_4), metadata_quorum=isolated_kraft)
+    @parametrize(from_kafka_version=str(LATEST_3_5), metadata_quorum=isolated_kraft)
+    @parametrize(from_kafka_version=str(DEV_VERSION), metadata_quorum=isolated_kraft)
     def test_isolated_mode_upgrade(self, from_kafka_version, metadata_quorum):
         self.run_upgrade(from_kafka_version)
 
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 0d0a85a8b7e..0656d767fe2 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -122,7 +122,7 @@ def get_version(node=None):
 DEV_BRANCH = KafkaVersion("dev")
 DEV_VERSION = KafkaVersion("3.6.0-SNAPSHOT")
 
-LATEST_METADATA_VERSION = "3.3"
+LATEST_METADATA_VERSION = "3.6"
 
 # 0.8.2.x versions
 V_0_8_2_1 = KafkaVersion("0.8.2.1")
@@ -252,3 +252,7 @@ LATEST_3_4 = V_3_4_1
 V_3_5_0 = KafkaVersion("3.5.0")
 V_3_5_1 = KafkaVersion("3.5.1")
 LATEST_3_5 = V_3_5_1
+
+# 3.6.x versions
+V_3_6_0 = KafkaVersion("3.6.0")
+LATEST_3_6 = V_3_6_0