Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Kafka 3.6.x checks from STs #10398

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Remove Kafka 3.6.x checks from STs #10398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions systemtest/src/test/java/io/strimzi/systemtest/cruisecontrol/CruiseControlST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import io.strimzi.systemtest.templates.specific.ScraperTemplates;
import io.strimzi.systemtest.utils.AdminClientUtils;
import io.strimzi.systemtest.utils.RollingUpdateUtils;
import io.strimzi.systemtest.utils.TestKafkaVersion;
import io.strimzi.systemtest.utils.VerificationUtils;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaRebalanceUtils;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaTopicUtils;
Expand Down Expand Up @@ -72,7 +71,6 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

@Tag(REGRESSION)
@Tag(CRUISE_CONTROL)
Expand Down Expand Up @@ -365,11 +363,6 @@ void testCruiseControlReplicaMovementStrategy() {

@ParallelNamespaceTest
void testCruiseControlIntraBrokerBalancing() {
// JBOD storage in KRaft is supported only from Kafka 3.7.0 and higher.
// So we want to run this test when KRaft is disabled or when it is with KRaft and Kafka 3.7.0+
// TODO: remove once support for 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(!Environment.isKRaftModeEnabled() || TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);

final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());
String diskSize = "6Gi";

Expand Down
16 changes: 0 additions & 16 deletions systemtest/src/test/java/io/strimzi/systemtest/kafka/KafkaST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import io.strimzi.systemtest.utils.ClientUtils;
import io.strimzi.systemtest.utils.RollingUpdateUtils;
import io.strimzi.systemtest.utils.StUtils;
import io.strimzi.systemtest.utils.TestKafkaVersion;
import io.strimzi.systemtest.utils.VerificationUtils;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaUtils;
import io.strimzi.systemtest.utils.kubeUtils.controllers.ConfigMapUtils;
Expand Down Expand Up @@ -89,7 +88,6 @@
import static org.hamcrest.Matchers.emptyOrNullString;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

@Tag(REGRESSION)
@SuppressWarnings("checkstyle:ClassFanOutComplexity")
Expand Down Expand Up @@ -405,10 +403,6 @@ void testRemoveComponentsFromEntityOperator() {
*/
@ParallelNamespaceTest
void testKafkaJBODDeleteClaimsTrueFalse() {
// JBOD storage in KRaft is supported only from Kafka 3.7.0 and higher.
// So we want to run this test when KRaft is disabled or when it is with KRaft and Kafka 3.7.0+
// TODO: remove once support for 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(!Environment.isKRaftModeEnabled() || TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);
final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());
final int kafkaReplicas = 2;
final String diskSizeGi = "10";
Expand Down Expand Up @@ -561,11 +555,6 @@ void testRegenerateCertExternalAddressChange() {
@SuppressWarnings({"checkstyle:JavaNCSS", "checkstyle:NPathComplexity", "checkstyle:MethodLength", "checkstyle:CyclomaticComplexity"})
@Tag(INTERNAL_CLIENTS_USED)
void testLabelsExistenceAndManipulation() {
// JBOD storage in KRaft is supported only from Kafka 3.7.0 and higher.
// So we want to run this test when KRaft is disabled or when it is with KRaft and Kafka 3.7.0+
// TODO: remove once support for 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(!Environment.isKRaftModeEnabled() || TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);

final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());

// label key and values to be used as part of kafka CR
Expand Down Expand Up @@ -1124,11 +1113,6 @@ void testDeployUnsupportedKafka() {
@MultiNodeClusterOnly // in multi-node we use different Storage Class, which support re-sizing of volumes
@ParallelNamespaceTest
void testResizeJbodVolumes() {
// JBOD storage in KRaft is supported only from Kafka 3.7.0 and higher.
// So we want to run this test when KRaft is disabled or when it is with KRaft and Kafka 3.7.0+
// TODO: remove once support for 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(!Environment.isKRaftModeEnabled() || TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);

final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());
final int numberOfKafkaReplicas = 3;

Expand Down
6 changes: 1 addition & 5 deletions systemtest/src/test/java/io/strimzi/systemtest/log/LoggingChangeST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import io.strimzi.systemtest.templates.specific.ScraperTemplates;
import io.strimzi.systemtest.utils.RollingUpdateUtils;
import io.strimzi.systemtest.utils.StUtils;
import io.strimzi.systemtest.utils.TestKafkaVersion;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaBridgeUtils;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaConnectUtils;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaConnectorUtils;
Expand Down Expand Up @@ -720,10 +719,7 @@ void testDynamicallyAndNonDynamicSetConnectLoggingLevels() {
final Pattern log4jPatternDebugLevel = Pattern.compile("^(?<date>[\\d-]+) (?<time>[\\d:,]+) DEBUG (?<message>.+)");
final Pattern log4jPatternInfoLevel = Pattern.compile("^(?<date>[\\d-]+) (?<time>[\\d:,]+) INFO (?<message>.+)");

// logging changes on multiple Connect instances are possible from Kafka 3.7.0
// TODO: change once support for Kafka 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
final int connectReplicas = TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0 ? 3 : 1;

final int connectReplicas = 3;
final KafkaConnect connect = KafkaConnectTemplates.kafkaConnect(testStorage.getClusterName(), testStorage.getNamespaceName(), connectReplicas)
.editSpec()
.withLogging(new InlineLoggingBuilder()
Expand Down
4 changes: 0 additions & 4 deletions systemtest/src/test/java/io/strimzi/systemtest/migration/MigrationST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import io.strimzi.systemtest.templates.crd.KafkaUserTemplates;
import io.strimzi.systemtest.utils.ClientUtils;
import io.strimzi.systemtest.utils.RollingUpdateUtils;
import io.strimzi.systemtest.utils.TestKafkaVersion;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaUtils;
import io.strimzi.systemtest.utils.kubeUtils.objects.PodUtils;
import io.strimzi.test.TestUtils;
Expand Down Expand Up @@ -787,9 +786,6 @@ private void assertThatClusterMetadataTopicPresentInBrokerPod(String namespaceNa

@BeforeAll
void setup() {
// skip if Kafka version is lower than 3.7.0
// TODO: remove once support for Kafka 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);
assumeTrue(Environment.isKafkaNodePoolsEnabled() && Environment.isKRaftModeEnabled());
this.clusterOperator = this.clusterOperator
.defaultInstallation()
Expand Down
12 changes: 0 additions & 12 deletions ...est/src/test/java/io/strimzi/systemtest/rollingupdate/AlternativeReconcileTriggersST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import io.strimzi.systemtest.utils.ClientUtils;
import io.strimzi.systemtest.utils.RollingUpdateUtils;
import io.strimzi.systemtest.utils.StUtils;
import io.strimzi.systemtest.utils.TestKafkaVersion;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaTopicUtils;
import io.strimzi.systemtest.utils.kafkaUtils.KafkaUtils;
import io.strimzi.systemtest.utils.kubeUtils.controllers.StrimziPodSetUtils;
Expand Down Expand Up @@ -65,7 +64,6 @@
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

@Tag(REGRESSION)
@Tag(INTERNAL_CLIENTS_USED)
Expand Down Expand Up @@ -339,11 +337,6 @@ void testManualRollingUpdateForSinglePod() {
*/
@ParallelNamespaceTest
void testAddingAndRemovingJbodVolumes() {
// JBOD storage in KRaft is supported only from Kafka 3.7.0 and higher.
// So we want to run this test when KRaft is disabled or when it is with KRaft and Kafka 3.7.0+
// TODO: remove once support for 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(!Environment.isKRaftModeEnabled() || TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);

final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());

// 500 messages will take 500 seconds in that case
Expand Down Expand Up @@ -491,11 +484,6 @@ void testAddingAndRemovingJbodVolumes() {
*/
@ParallelNamespaceTest
void testJbodMetadataLogRelocation() {
// JBOD storage in KRaft is supported only from Kafka 3.7.0 and higher.
// So we want to run this test when KRaft is disabled or when it is with KRaft and Kafka 3.7.0+
// TODO: remove once support for 3.6.x is removed - https://github.com/strimzi/strimzi-kafka-operator/issues/9921
assumeTrue(Environment.isKRaftModeEnabled() && TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "3.7.0") >= 0);

final TestStorage testStorage = new TestStorage(ResourceManager.getTestContext());
final int numberOfKafkaReplicas = 3;

Expand Down
Loading