Merge pull request #984 from quarkus-qe/revert-976-rewrite-kafka-utils

Revert "Update Kafka utils to use images from Maven properties"
quarkus-qe · Dec 17, 2023 · 871ef99 · 871ef99
2 parents bd00be7 + 0a0ffd9
commit 871ef99
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -64,10 +64,6 @@
         <quarkus.build.skip>${skipTests}</quarkus.build.skip>
         <!-- Oracle image - we aim to use same version as Dev Services for Oracle so that we only download one image -->
         <oracle.image>docker.io/gvenzl/oracle-free:23-slim-faststart</oracle.image>
-        <kafka.registry.confluent.image>confluentinc/cp-schema-registry:7.3.3</kafka.registry.confluent.image>
-        <kafka.registry.apicurio.image>quay.io/apicurio/apicurio-registry-mem:2.4.14.Final</kafka.registry.apicurio.image>
-        <kafka.vendor.confluent.image>confluentinc/cp-kafka:7.3.3</kafka.vendor.confluent.image>
-        <kafka.vendor.strimzi.image>quay.io/strimzi/kafka:0.34.0-kafka-3.4.0</kafka.vendor.strimzi.image>
     </properties>
     <distributionManagement>
         <snapshotRepository>
@@ -349,10 +345,6 @@
                         <configuration>
                             <systemProperties>
                                 <oracle.image>${oracle.image}</oracle.image>
-                                <kafka.registry.confluent.image>${kafka.registry.confluent.image}</kafka.registry.confluent.image>
-                                <kafka.registry.apicurio.image>${kafka.registry.apicurio.image}</kafka.registry.apicurio.image>
-                                <kafka.vendor.confluent.image>${kafka.vendor.confluent.image}</kafka.vendor.confluent.image>
-                                <kafka.vendor.strimzi.image>${kafka.vendor.strimzi.image}</kafka.vendor.strimzi.image>
                             </systemProperties>
                             <argLine>${jacoco.agent.argLine}</argLine>
                             <excludedGroups>${exclude.tests.with.tags}</excludedGroups>

diff --git a/...-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java b/...-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java
@@ -1,26 +1,23 @@
 package io.quarkus.test.services.containers.model;
 
-import static io.quarkus.test.utils.ImageUtil.getImageName;
-import static io.quarkus.test.utils.ImageUtil.getImageVersion;
-
 public enum KafkaRegistry {
-    CONFLUENT("kafka.registry.confluent.image", "/", 8081),
-    APICURIO("kafka.registry.apicurio.image", "/apis", 8080);
+    CONFLUENT("confluentinc/cp-schema-registry", "7.3.3", "/", 8081),
+    APICURIO("quay.io/apicurio/apicurio-registry-mem", "2.4.14.Final", "/apis", 8080);
 
-    private final String imageName;
+    private final String image;
     private final String defaultVersion;
     private final String path;
     private final int port;
 
-    KafkaRegistry(String imagePropertyName, String path, int port) {
-        this.imageName = getImageName(imagePropertyName);
-        this.defaultVersion = getImageVersion(imagePropertyName);
+    KafkaRegistry(String image, String defaultVersion, String path, int port) {
+        this.image = image;
+        this.defaultVersion = defaultVersion;
         this.path = path;
         this.port = port;
     }
 
     public String getImage() {
-        return imageName;
+        return image;
     }
 
     public String getDefaultVersion() {

diff --git a/...st-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaVendor.java b/...st-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaVendor.java
@@ -1,26 +1,23 @@
 package io.quarkus.test.services.containers.model;
 
-import static io.quarkus.test.utils.ImageUtil.getImageName;
-import static io.quarkus.test.utils.ImageUtil.getImageVersion;
-
 public enum KafkaVendor {
-    CONFLUENT("kafka.vendor.confluent.image", 9093, KafkaRegistry.CONFLUENT),
-    STRIMZI("kafka.vendor.strimzi.image", 9092, KafkaRegistry.APICURIO);
+    CONFLUENT("confluentinc/cp-kafka", "7.3.3", 9093, KafkaRegistry.CONFLUENT),
+    STRIMZI("quay.io/strimzi/kafka", "0.34.0-kafka-3.4.0", 9092, KafkaRegistry.APICURIO);
 
-    private final String imageName;
+    private final String image;
     private final String defaultVersion;
     private final int port;
     private final KafkaRegistry registry;
 
-    KafkaVendor(String imagePropertyName, int port, KafkaRegistry registry) {
-        this.imageName = getImageName(imagePropertyName);
-        this.defaultVersion = getImageVersion(imagePropertyName);
+    KafkaVendor(String image, String defaultVersion, int port, KafkaRegistry registry) {
+        this.image = image;
+        this.defaultVersion = defaultVersion;
         this.port = port;
         this.registry = registry;
     }
 
     public String getImage() {
-        return imageName;
+        return image;
     }
 
     public String getDefaultVersion() {