[kafka] branch trunk updated: MINOR: fix kraft upgrade system test (#14424)

[showuon]

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

showuon 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 6f9681e10f4 MINOR: fix kraft upgrade system test (#14424)
6f9681e10f4 is described below

commit 6f9681e10f4a94574e7b8e143baea92525d55293
Author: Luke Chen <show...@gmail.com>
AuthorDate: Sat Sep 23 11:20:22 2023 +0800

    MINOR: fix kraft upgrade system test (#14424)
    
    We should use DEV_BRANCH instead of DEV_VERSION in this case, otherwise, 
error will be thrown:
    
    RunnerClient: 
kafkatest.tests.core.kraft_upgrade_test.TestKRaftUpgrade.test_isolated_mode_upgrade.from_kafka_version=3.6.0-SNAPSHOT.metadata_quorum=ISOLATED_KRAFT:
 FAIL: RemoteCommandError({'ssh_config': {'host': 'ducker10', 'hostname': 
'ducker10', 'user': 'ducker', 'port': 22, 'password': '', 'identityfile': 
'/home/ducker/.ssh/id_rsa', 'connecttimeout': None}, 'hostname': 'ducker10', 
'ssh_hostname': 'ducker10', 'user': 'ducker', 'externally_routable_ip': 
'ducker10', '_logger': <Logge [...]
    
    Reviewers: Satish Duggana <sati...@apache.org>
---
 tests/kafkatest/tests/core/kraft_upgrade_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/kafkatest/tests/core/kraft_upgrade_test.py 
b/tests/kafkatest/tests/core/kraft_upgrade_test.py
index 7a3bc87ad1d..221e43f6baf 100644
--- a/tests/kafkatest/tests/core/kraft_upgrade_test.py
+++ b/tests/kafkatest/tests/core/kraft_upgrade_test.py
@@ -23,7 +23,7 @@ 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_1, LATEST_3_2, LATEST_3_3, LATEST_3_4, 
LATEST_3_5, \
-    DEV_BRANCH, DEV_VERSION, KafkaVersion, LATEST_METADATA_VERSION
+    DEV_BRANCH, KafkaVersion, LATEST_METADATA_VERSION
 
 #
 # Test upgrading between different KRaft versions.
@@ -114,7 +114,7 @@ class TestKRaftUpgrade(ProduceConsumeValidateTest):
     @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)
+    @parametrize(from_kafka_version=str(DEV_BRANCH), 
metadata_quorum=combined_kraft)
     def test_combined_mode_upgrade(self, from_kafka_version, metadata_quorum):
         self.run_upgrade(from_kafka_version)
 
@@ -124,7 +124,7 @@ class TestKRaftUpgrade(ProduceConsumeValidateTest):
     @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)
+    @parametrize(from_kafka_version=str(DEV_BRANCH), 
metadata_quorum=isolated_kraft)
     def test_isolated_mode_upgrade(self, from_kafka_version, metadata_quorum):
         self.run_upgrade(from_kafka_version)