From 2b57b38f9306ac73f18d94d55c0158530fd444df Mon Sep 17 00:00:00 2001 From: "Matthias J. Sax" Date: Thu, 5 Oct 2023 10:58:52 -0700 Subject: [PATCH] HOTIFX: fix Kafka versions for system tests (#14496) Reviewers: Bill Bejeck --- tests/docker/Dockerfile | 14 ++++++++------ tests/kafkatest/version.py | 17 +++++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index d7c16d438a6..e7dc0d15417 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -60,9 +60,10 @@ RUN mkdir -p "/opt/kafka-2.2.2" && chmod a+rw /opt/kafka-2.2.2 && curl -s "$KAFK RUN mkdir -p "/opt/kafka-2.3.1" && chmod a+rw /opt/kafka-2.3.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.3.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.3.1" RUN mkdir -p "/opt/kafka-2.4.1" && chmod a+rw /opt/kafka-2.4.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.4.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.4.1" RUN mkdir -p "/opt/kafka-2.5.1" && chmod a+rw /opt/kafka-2.5.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.5.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.5.1" -RUN mkdir -p "/opt/kafka-2.6.2" && chmod a+rw /opt/kafka-2.6.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.6.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.6.2" -RUN mkdir -p "/opt/kafka-2.7.1" && chmod a+rw /opt/kafka-2.7.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.7.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.7.1" -RUN mkdir -p "/opt/kafka-2.8.1" && chmod a+rw /opt/kafka-2.8.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.8.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.8.1" +RUN mkdir -p "/opt/kafka-2.6.3" && chmod a+rw /opt/kafka-2.6.3 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.6.3.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.6.3" +RUN mkdir -p "/opt/kafka-2.7.2" && chmod a+rw /opt/kafka-2.7.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.7.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.7.2" +RUN mkdir -p "/opt/kafka-2.8.2" && chmod a+rw /opt/kafka-2.8.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.8.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.8.2" +RUN mkdir -p "/opt/kafka-3.0.2" && chmod a+rw /opt/kafka-3.0.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.0.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.0.2" # Streams test dependencies RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.0.1-test.jar" -o /opt/kafka-0.10.0.1/libs/kafka-streams-0.10.0.1-test.jar @@ -77,9 +78,10 @@ RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.2.2-test.jar" -o /opt/kafka-2.2.2/lib RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.3.1-test.jar" -o /opt/kafka-2.3.1/libs/kafka-streams-2.3.1-test.jar RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.4.1-test.jar" -o /opt/kafka-2.4.1/libs/kafka-streams-2.4.1-test.jar RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.5.1-test.jar" -o /opt/kafka-2.5.1/libs/kafka-streams-2.5.1-test.jar -RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.6.2-test.jar" -o /opt/kafka-2.6.2/libs/kafka-streams-2.6.2-test.jar -RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.7.1-test.jar" -o /opt/kafka-2.7.1/libs/kafka-streams-2.7.1-test.jar -RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.8.1-test.jar" -o /opt/kafka-2.8.1/libs/kafka-streams-2.8.1-test.jar +RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.6.3-test.jar" -o /opt/kafka-2.6.3/libs/kafka-streams-2.6.3-test.jar +RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.7.2-test.jar" -o /opt/kafka-2.7.2/libs/kafka-streams-2.7.2-test.jar +RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.8.2-test.jar" -o /opt/kafka-2.8.2/libs/kafka-streams-2.8.2-test.jar +RUN curl -s "$KAFKA_MIRROR/kafka-streams-3.0.2-test.jar" -o /opt/kafka-3.0.2/libs/kafka-streams-3.0.2-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 f2862c7a1f4..b15a1dcbd91 100644 --- a/tests/kafkatest/version.py +++ b/tests/kafkatest/version.py @@ -116,7 +116,7 @@ def get_version(node=None): return DEV_BRANCH DEV_BRANCH = KafkaVersion("dev") -DEV_VERSION = KafkaVersion("3.1.2-SNAPSHOT") +DEV_VERSION = KafkaVersion("3.1.3-SNAPSHOT") # 0.8.2.x versions V_0_8_2_1 = KafkaVersion("0.8.2.1") @@ -200,24 +200,29 @@ LATEST_2_5 = V_2_5_1 V_2_6_0 = KafkaVersion("2.6.0") V_2_6_1 = KafkaVersion("2.6.1") V_2_6_2 = KafkaVersion("2.6.2") -LATEST_2_6 = V_2_6_2 +V_2_6_3 = KafkaVersion("2.6.3") +LATEST_2_6 = V_2_6_3 # 2.7.x versions V_2_7_0 = KafkaVersion("2.7.0") V_2_7_1 = KafkaVersion("2.7.1") -LATEST_2_7 = V_2_7_1 +V_2_7_2 = KafkaVersion("2.7.2") +LATEST_2_7 = V_2_7_2 # 2.8.x versions V_2_8_0 = KafkaVersion("2.8.0") V_2_8_1 = KafkaVersion("2.8.1") -LATEST_2_8 = V_2_8_1 +V_2_8_2 = KafkaVersion("2.8.2") +LATEST_2_8 = V_2_8_2 # 3.0.x versions V_3_0_0 = KafkaVersion("3.0.0") V_3_0_1 = KafkaVersion("3.0.1") -LATEST_3_0 = V_3_0_1 +V_3_0_2 = KafkaVersion("3.0.2") +LATEST_3_0 = V_3_0_2 # 3.1.x versions V_3_1_0 = KafkaVersion("3.1.0") V_3_1_1 = KafkaVersion("3.1.1") -LATEST_3_1 = V_3_1_1 +V_3_1_2 = KafkaVersion("3.1.2") +LATEST_3_1 = V_3_1_2