MINOR: Add 3.5.2 and 3.6.1 to system tests (#14932)
Reviewers: Matthias J. Sax <mjsax@apache.org>
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 09eea0a..258b4c1 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -140,8 +140,8 @@
kafka_32: "3.2.3",
kafka_33: "3.3.2",
kafka_34: "3.4.1",
- kafka_35: "3.5.1",
- kafka_36: "3.6.0",
+ kafka_35: "3.5.2",
+ kafka_36: "3.6.1",
lz4: "1.8.0",
mavenArtifact: "3.8.8",
metrics: "2.2.0",
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index b86b100..60da7e6 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -68,8 +68,8 @@
RUN mkdir -p "/opt/kafka-3.2.3" && chmod a+rw /opt/kafka-3.2.3 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.2.3.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.2.3"
RUN mkdir -p "/opt/kafka-3.3.2" && chmod a+rw /opt/kafka-3.3.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.3.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.3.2"
RUN mkdir -p "/opt/kafka-3.4.1" && chmod a+rw /opt/kafka-3.4.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.4.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.4.1"
-RUN mkdir -p "/opt/kafka-3.5.1" && chmod a+rw /opt/kafka-3.5.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.5.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.5.1"
-RUN mkdir -p "/opt/kafka-3.6.0" && chmod a+rw /opt/kafka-3.6.0 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.6.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.6.0"
+RUN mkdir -p "/opt/kafka-3.5.2" && chmod a+rw /opt/kafka-3.5.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.5.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.5.2"
+RUN mkdir -p "/opt/kafka-3.6.1" && chmod a+rw /opt/kafka-3.6.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.6.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.6.1"
# Streams test dependencies
@@ -93,8 +93,8 @@
RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.2.3-test.jar" -o /opt/kafka-3.2.3/libs/kafka-streams-3.2.3-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.3.2-test.jar" -o /opt/kafka-3.3.2/libs/kafka-streams-3.3.2-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.4.1-test.jar" -o /opt/kafka-3.4.1/libs/kafka-streams-3.4.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.5.1-test.jar" -o /opt/kafka-3.5.1/libs/kafka-streams-3.5.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.6.0-test.jar" -o /opt/kafka-3.6.0/libs/kafka-streams-3.6.0-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.5.2-test.jar" -o /opt/kafka-3.5.2/libs/kafka-streams-3.5.2-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.6.1-test.jar" -o /opt/kafka-3.6.1/libs/kafka-streams-3.6.1-test.jar
# The version of Kibosh to use for testing.
# If you update this, also update vagrant/base.sh
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 5d24fb5..6d0b1ae 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -256,10 +256,10 @@
# 3.5.x versions
V_3_5_0 = KafkaVersion("3.5.0")
V_3_5_1 = KafkaVersion("3.5.1")
-LATEST_3_5 = V_3_5_1
+V_3_5_2 = KafkaVersion("3.5.2")
+LATEST_3_5 = V_3_5_2
# 3.6.x versions
V_3_6_0 = KafkaVersion("3.6.0")
-LATEST_3_6 = V_3_6_0
-
-# only add released versions here
+V_3_6_1 = KafkaVersion("3.6.1")
+LATEST_3_6 = V_3_6_1
diff --git a/vagrant/base.sh b/vagrant/base.sh
index cc10ed1..59bd86f 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -158,10 +158,11 @@
chmod a+rw /opt/kafka-3.3.2
get_kafka 3.4.1 2.12
chmod a+rw /opt/kafka-3.4.1
-get_kafka 3.5.1 2.12
-chmod a+rw /opt/kafka-3.5.1
-get_kafka 3.6.0 2.12
-chmod a+rw /opt/kafka-3.6.0
+get_kafka 3.5.2 2.12
+chmod a+rw /opt/kafka-3.5.2
+get_kafka 3.6.1 2.12
+chmod a+rw /opt/kafka-3.6.1
+
# For EC2 nodes, we want to use /mnt, which should have the local disk. On local
# VMs, we can just create it if it doesn't exist and use it like we'd use