Update Kafka versions to mirror Strimzi kafka operator repository

src/main/java/io/strimzi/test/container/StrimziKafkaCluster.java

@@ -335,13 +335,8 @@ public void start() {
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw new RuntimeException("Interrupted while starting Kafka containers", e);
-        } catch (ExecutionException | UnsupportedKraftKafkaVersionException e) {
-            Throwable cause = e.getCause();
-            if (cause instanceof UnsupportedKraftKafkaVersionException) {
-                throw (UnsupportedKraftKafkaVersionException) cause;
-            } else {
-                throw new RuntimeException("Failed to start Kafka containers", e);
-            }
+        } catch (ExecutionException e) {
+            throw new RuntimeException("Failed to start Kafka containers", e);
         } catch (TimeoutException e) {
             throw new RuntimeException("Timed out while starting Kafka containers", e);
         }

src/main/java/io/strimzi/test/container/StrimziKafkaContainer.java

@@ -163,14 +163,6 @@ protected void doStart() {
             this.imageNameProvider.complete(KafkaVersionService.strimziTestContainerImageName(this.kafkaVersion));
         }
 
-        try {
-            if (this.useKraft && ((this.kafkaVersion != null && this.kafkaVersion.startsWith("2.")) || this.imageNameProvider.get().contains("2.8.2"))) {
-                throw new UnsupportedKraftKafkaVersionException("Specified Kafka version " + this.kafkaVersion + " is not supported in KRaft mode.");
-            }
-        } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error occurred during retrieving of image name provider", e);
-            throw new RuntimeException(e);
-        }
         // exposing Kafka and port from the container
         if (!this.hasKraftOrExternalZooKeeperConfigured()) {
             // expose internal ZooKeeper internal port iff external ZooKeeper or KRaft is not specified/enabled

src/main/resources/kafka_versions.json

@@ -1,14 +1,6 @@
 {
   "kafkaVersions": {
-    "2.8.2": "quay.io/strimzi-test-container/test-container:latest-kafka-2.8.2",
-    "3.0.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.0.2",
-    "3.1.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.1.2",
-    "3.2.3": "quay.io/strimzi-test-container/test-container:latest-kafka-3.2.3",
-    "3.3.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.3.2",
-    "3.4.1": "quay.io/strimzi-test-container/test-container:latest-kafka-3.4.1",
-    "3.5.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.5.2",
-    "3.6.2": "quay.io/strimzi-test-container/test-container:latest-kafka-3.6.2",
-    "3.7.1": "quay.io/strimzi-test-container/test-container:latest-kafka-3.7.1",
+    "3.8.0": "quay.io/strimzi-test-container/test-container:latest-kafka-3.8.0",
     "3.8.1": "quay.io/strimzi-test-container/test-container:latest-kafka-3.8.1",
     "3.9.0": "quay.io/strimzi-test-container/test-container:latest-kafka-3.9.0"
   }

src/test/java/io/strimzi/test/container/AbstractIT.java

@@ -11,7 +11,6 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.params.provider.Arguments;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,12 +37,4 @@ protected static Stream<Arguments> retrieveKafkaVersionsFile() throws IOExceptio
         }
         return parameters.stream();
     }
-
-    protected void supportsKraftMode(final String imageName) {
-        Assumptions.assumeTrue(!imageName.contains("-kafka-2."));
-    }
-
-    protected boolean isLessThanKafka350(final String kafkaVersion) {
-        return KafkaVersionService.KafkaVersion.compareVersions(kafkaVersion, "3.5.0") == -1;
-    }
 }

src/test/java/io/strimzi/test/container/StrimziKafkaContainerTest.java

@@ -90,13 +90,13 @@ void testBootstrapServersWithProxy() {
     }
 
     @Test
-    void testUnsupportedKraftVersionThrowsException() {
+    void testUnsupportedVersionThrowsException() {
         StrimziKafkaContainer kafkaContainer = new StrimziKafkaContainer()
             .withKafkaVersion("2.8.2")
             .withKraft();
 
-        // "Specified Kafka version 2.8.2 is not supported in KRaft mode."
-        assertThrows(UnsupportedKraftKafkaVersionException.class, kafkaContainer::doStart);
+        // "Specified Kafka version 2.8.2 is not supported ."
+        assertThrows(UnknownKafkaVersionException.class, kafkaContainer::doStart);
     }
 
     @Test

src/test/java/io/strimzi/test/container/StrimziKafkaKraftContainerIT.java

@@ -49,8 +49,6 @@ public class StrimziKafkaKraftContainerIT extends AbstractIT {
     @ParameterizedTest(name = "testStartContainerWithEmptyConfiguration-{0}")
     @MethodSource("retrieveKafkaVersionsFile")
     void testStartContainerWithEmptyConfiguration(final String imageName, final String kafkaVersion) throws ExecutionException, InterruptedException, TimeoutException {
-        supportsKraftMode(imageName);
-
         systemUnderTest = new StrimziKafkaContainer(imageName)
             .withBrokerId(1)
             .withKraft()
@@ -60,12 +58,8 @@ void testStartContainerWithEmptyConfiguration(final String imageName, final Stri
         assertThat(systemUnderTest.getClusterId(), notNullValue());
 
         String logsFromKafka = systemUnderTest.getLogs();
-        if (isLessThanKafka350(kafkaVersion)) {
-            assertThat(logsFromKafka, containsString("RaftManager nodeId=1"));
-        } else {
-            assertThat(logsFromKafka, containsString("ControllerServer id=1"));
-            assertThat(logsFromKafka, containsString("SocketServer listenerType=CONTROLLER, nodeId=1"));
-        }
+        assertThat(logsFromKafka, containsString("ControllerServer id=1"));
+        assertThat(logsFromKafka, containsString("SocketServer listenerType=CONTROLLER, nodeId=1"));
 
         verify();
 
@@ -76,8 +70,6 @@ void testStartContainerWithEmptyConfiguration(final String imageName, final Stri
     @ParameterizedTest(name = "testStartContainerWithSomeConfiguration-{0}")
     @MethodSource("retrieveKafkaVersionsFile")
     void testStartContainerWithSomeConfiguration(final String imageName, final String kafkaVersion) throws ExecutionException, InterruptedException, TimeoutException {
-        supportsKraftMode(imageName);
-
         Map<String, String> kafkaConfiguration = new HashMap<>();
 
         kafkaConfiguration.put("log.cleaner.enable", "false");
@@ -95,12 +87,8 @@ void testStartContainerWithSomeConfiguration(final String imageName, final Strin
 
         String logsFromKafka = systemUnderTest.getLogs();
 
-        if (isLessThanKafka350(kafkaVersion)) {
-            assertThat(logsFromKafka, containsString("RaftManager nodeId=1"));
-        } else {
-            assertThat(logsFromKafka, containsString("ControllerServer id=1"));
-            assertThat(logsFromKafka, containsString("SocketServer listenerType=CONTROLLER, nodeId=1"));
-        }
+        assertThat(logsFromKafka, containsString("ControllerServer id=1"));
+        assertThat(logsFromKafka, containsString("SocketServer listenerType=CONTROLLER, nodeId=1"));
         assertThat(logsFromKafka, containsString("log.cleaner.enable = false"));
         assertThat(logsFromKafka, containsString("log.cleaner.backoff.ms = 1000"));
         assertThat(logsFromKafka, containsString("ssl.enabled.protocols = [TLSv1]"));
@@ -117,23 +105,12 @@ void testUnsupportedKRaftUsingKafkaVersion() {
             .withKraft()
             .waitForRunning();
 
-        assertThrows(UnsupportedKraftKafkaVersionException.class, () -> systemUnderTest.start());
-    }
-
-    @Test
-    void testUnsupportedKRaftUsingImageName() {
-        systemUnderTest = new StrimziKafkaContainer("quay.io/strimzi-test-container/test-container:latest-kafka-2.8.2")
-            .withBrokerId(1)
-            .withKraft()
-            .waitForRunning();
-
-        assertThrows(UnsupportedKraftKafkaVersionException.class, () -> systemUnderTest.start());
+        assertThrows(UnknownKafkaVersionException.class, () -> systemUnderTest.start());
     }
 
     @ParameterizedTest(name = "testStartContainerWithSomeConfiguration-{0}")
     @MethodSource("retrieveKafkaVersionsFile")
     void testUnsupportedKraftAndIdsMismatch(final String imageName, final String kafkaVersion) {
-        supportsKraftMode(imageName);
         systemUnderTest = new StrimziKafkaContainer(imageName)
                 .withNodeId(1)
                 .withBrokerId(2)