This is an automated email from the ASF dual-hosted git repository.
bbejeck 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 bf694b2 MINOR: Add 2.7.0 release to broker and client compat tests
(#9774)
bf694b2 is described below
commit bf694b29439d27a527b0be5a8fb7a25fc280c892
Author: Bill Bejeck <[email protected]>
AuthorDate: Tue Jan 5 09:45:00 2021 -0500
MINOR: Add 2.7.0 release to broker and client compat tests (#9774)
Reviewers: Chia-Ping Tsai <[email protected]>, Ismael Juma
<[email protected]>
---
.../tests/client/client_compatibility_features_test.py | 4 +++-
.../client/client_compatibility_produce_consume_test.py | 4 +++-
.../tests/core/compatibility_test_new_broker_test.py | 4 +++-
tests/kafkatest/tests/core/upgrade_test.py | 12 +++++++++---
4 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 e9a9c3b..4e7aeed 100644
--- a/tests/kafkatest/tests/client/client_compatibility_features_test.py
+++ b/tests/kafkatest/tests/client/client_compatibility_features_test.py
@@ -25,7 +25,7 @@ from ducktape.tests.test import TestContext
from kafkatest.services.zookeeper import ZookeeperService
from kafkatest.services.kafka import KafkaService
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, V_0_11_0_0, V_0_10_1_0,
KafkaVersion
+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,
V_0_11_0_0, V_0_10_1_0, KafkaVersion
def get_broker_features(broker_version):
features = {}
@@ -120,6 +120,8 @@ class ClientCompatibilityFeaturesTest(Test):
@parametrize(broker_version=str(LATEST_2_3))
@parametrize(broker_version=str(LATEST_2_4))
@parametrize(broker_version=str(LATEST_2_5))
+ @parametrize(broker_version=str(LATEST_2_6))
+ @parametrize(broker_version=str(LATEST_2_7))
def run_compatibility_test(self, broker_version):
self.zk.start()
self.kafka.set_version(KafkaVersion(broker_version))
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 b3e598f..52d41f5 100644
--- a/tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py
+++ b/tests/kafkatest/tests/client/client_compatibility_produce_consume_test.py
@@ -22,7 +22,7 @@ from kafkatest.services.verifiable_producer import
VerifiableProducer
from kafkatest.services.console_consumer import ConsoleConsumer
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, KafkaVersion
+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,
KafkaVersion
class ClientCompatibilityProduceConsumeTest(ProduceConsumeValidateTest):
"""
@@ -65,6 +65,8 @@ class
ClientCompatibilityProduceConsumeTest(ProduceConsumeValidateTest):
@parametrize(broker_version=str(LATEST_2_3))
@parametrize(broker_version=str(LATEST_2_4))
@parametrize(broker_version=str(LATEST_2_5))
+ @parametrize(broker_version=str(LATEST_2_6))
+ @parametrize(broker_version=str(LATEST_2_7))
def test_produce_consume(self, broker_version):
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 cfc1272..5474112 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,7 @@ from kafkatest.services.verifiable_producer import
VerifiableProducer
from kafkatest.services.zookeeper import ZookeeperService
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,
DEV_BRANCH, KafkaVersion
+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, 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):
@@ -52,6 +52,8 @@ class
ClientCompatibilityTestNewBroker(ProduceConsumeValidateTest):
@parametrize(producer_version=str(LATEST_2_3),
consumer_version=str(LATEST_2_3), compression_types=["none"],
timestamp_type=str("CreateTime"))
@parametrize(producer_version=str(LATEST_2_4),
consumer_version=str(LATEST_2_4), compression_types=["none"],
timestamp_type=str("CreateTime"))
@parametrize(producer_version=str(LATEST_2_5),
consumer_version=str(LATEST_2_5), compression_types=["none"],
timestamp_type=str("CreateTime"))
+ @parametrize(producer_version=str(LATEST_2_6),
consumer_version=str(LATEST_2_6), compression_types=["none"],
timestamp_type=str("CreateTime"))
+ @parametrize(producer_version=str(LATEST_2_7),
consumer_version=str(LATEST_2_7), compression_types=["none"],
timestamp_type=str("CreateTime"))
@parametrize(producer_version=str(LATEST_2_1),
consumer_version=str(LATEST_2_1), compression_types=["zstd"],
timestamp_type=str("CreateTime"))
@parametrize(producer_version=str(LATEST_2_0),
consumer_version=str(LATEST_2_0), compression_types=["snappy"],
timestamp_type=str("CreateTime"))
@parametrize(producer_version=str(LATEST_1_1),
consumer_version=str(LATEST_1_1), compression_types=["lz4"],
timestamp_type=str("CreateTime"))
diff --git a/tests/kafkatest/tests/core/upgrade_test.py
b/tests/kafkatest/tests/core/upgrade_test.py
index cf839af..2dd5b71 100644
--- a/tests/kafkatest/tests/core/upgrade_test.py
+++ b/tests/kafkatest/tests/core/upgrade_test.py
@@ -24,7 +24,7 @@ from kafkatest.services.zookeeper import ZookeeperService
from kafkatest.tests.produce_consume_validate import ProduceConsumeValidateTest
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, V_0_9_0_0, V_0_11_0_0, DEV_BRANCH, KafkaVersion
+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, V_0_9_0_0, V_0_11_0_0, DEV_BRANCH,
KafkaVersion
from kafkatest.services.kafka.util import new_jdk_not_supported
class TestUpgrade(ProduceConsumeValidateTest):
@@ -76,10 +76,16 @@ class TestUpgrade(ProduceConsumeValidateTest):
self.wait_until_rejoin()
@cluster(num_nodes=6)
- @parametrize(from_kafka_version=str(LATEST_2_4),
to_message_format_version=None, compression_types=["none"])
- @parametrize(from_kafka_version=str(LATEST_2_4),
to_message_format_version=None, compression_types=["zstd"])
+ @parametrize(from_kafka_version=str(LATEST_2_7),
to_message_format_version=None, compression_types=["none"])
+ @parametrize(from_kafka_version=str(LATEST_2_7),
to_message_format_version=None, compression_types=["lz4"])
+ @parametrize(from_kafka_version=str(LATEST_2_7),
to_message_format_version=None, compression_types=["snappy"])
+ @parametrize(from_kafka_version=str(LATEST_2_6),
to_message_format_version=None, compression_types=["none"])
+ @parametrize(from_kafka_version=str(LATEST_2_6),
to_message_format_version=None, compression_types=["lz4"])
+ @parametrize(from_kafka_version=str(LATEST_2_6),
to_message_format_version=None, compression_types=["snappy"])
@parametrize(from_kafka_version=str(LATEST_2_5),
to_message_format_version=None, compression_types=["none"])
@parametrize(from_kafka_version=str(LATEST_2_5),
to_message_format_version=None, compression_types=["zstd"])
+ @parametrize(from_kafka_version=str(LATEST_2_4),
to_message_format_version=None, compression_types=["none"])
+ @parametrize(from_kafka_version=str(LATEST_2_4),
to_message_format_version=None, compression_types=["zstd"])
@parametrize(from_kafka_version=str(LATEST_2_3),
to_message_format_version=None, compression_types=["none"])
@parametrize(from_kafka_version=str(LATEST_2_3),
to_message_format_version=None, compression_types=["zstd"])
@parametrize(from_kafka_version=str(LATEST_2_2),
to_message_format_version=None, compression_types=["none"])
