From a0b945e748de33ae986ec61291a73eb2b27c2624 Mon Sep 17 00:00:00 2001 From: David Arthur Date: Wed, 15 Apr 2020 10:26:55 -0400 Subject: [PATCH 1/2] Add 2.5 versions --- gradle/dependencies.gradle | 2 ++ tests/docker/Dockerfile | 2 ++ tests/kafkatest/version.py | 4 ++++ vagrant/base.sh | 2 ++ 4 files changed, 10 insertions(+) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 400b8ad06a8c1..307e4373b29b8 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -95,6 +95,7 @@ versions += [ kafka_22: "2.2.2", kafka_23: "2.3.1", kafka_24: "2.4.1", + kafka_25: "2.5.0", lz4: "1.7.1", mavenArtifact: "3.6.3", metrics: "2.2.0", @@ -164,6 +165,7 @@ libs += [ kafkaStreams_22: "org.apache.kafka:kafka-streams:$versions.kafka_22", kafkaStreams_23: "org.apache.kafka:kafka-streams:$versions.kafka_23", kafkaStreams_24: "org.apache.kafka:kafka-streams:$versions.kafka_24", + kafkaStreams_25: "org.apache.kafka:kafka-streams:$versions.kafka_25", log4j: "log4j:log4j:$versions.log4j", lz4: "org.lz4:lz4-java:$versions.lz4", metrics: "com.yammer.metrics:metrics-core:$versions.metrics", diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 36b7436256ad2..8ff45b188812b 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -58,6 +58,7 @@ RUN mkdir -p "/opt/kafka-2.1.1" && chmod a+rw /opt/kafka-2.1.1 && curl -s "$KAFK RUN mkdir -p "/opt/kafka-2.2.2" && chmod a+rw /opt/kafka-2.2.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.2.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.2.2" 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.0" && chmod a+rw /opt/kafka-2.5.0 && curl -s "$KAFKA_MIRROR/kafka_2.13-2.5.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.5.0" # 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 @@ -71,6 +72,7 @@ RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.1.1-test.jar" -o /opt/kafka-2.1.1/lib RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.2.2-test.jar" -o /opt/kafka-2.2.2/libs/kafka-streams-2.2.2-test.jar 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.0-test.jar" -o /opt/kafka-2.5.0/libs/kafka-streams-2.5.0-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 bc9251c00e29f..9a5f673b7ee5c 100644 --- a/tests/kafkatest/version.py +++ b/tests/kafkatest/version.py @@ -143,3 +143,7 @@ def get_version(node=None): V_2_4_0 = KafkaVersion("2.4.0") V_2_4_1 = KafkaVersion("2.4.1") LATEST_2_4 = V_2_4_1 + +# 2.5.x verisons +V_2_5_0 = KafkaVersion("2.5.0") +LATEST_2_5 = V_2_5_0 diff --git a/vagrant/base.sh b/vagrant/base.sh index bfdaf02165a1c..459d63c09dc01 100755 --- a/vagrant/base.sh +++ b/vagrant/base.sh @@ -140,6 +140,8 @@ get_kafka 2.3.1 2.12 chmod a+rw /opt/kafka-2.3.1 get_kafka 2.4.1 2.12 chmod a+rw /opt/kafka-2.4.1 +get_kafka 2.5.0 2.13 +chmod a+rw /opt/kafka-2.5.0 # 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 From bcaadbe430be6f2ab59efeef15d8ed6e36c19a39 Mon Sep 17 00:00:00 2001 From: David Arthur Date: Wed, 15 Apr 2020 10:53:40 -0400 Subject: [PATCH 2/2] Use Scala 2.12 instead of 2.13 --- tests/docker/Dockerfile | 2 +- vagrant/base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 8ff45b188812b..df81e7b42f482 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -58,7 +58,7 @@ RUN mkdir -p "/opt/kafka-2.1.1" && chmod a+rw /opt/kafka-2.1.1 && curl -s "$KAFK RUN mkdir -p "/opt/kafka-2.2.2" && chmod a+rw /opt/kafka-2.2.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.2.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.2.2" 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.0" && chmod a+rw /opt/kafka-2.5.0 && curl -s "$KAFKA_MIRROR/kafka_2.13-2.5.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.5.0" +RUN mkdir -p "/opt/kafka-2.5.0" && chmod a+rw /opt/kafka-2.5.0 && curl -s "$KAFKA_MIRROR/kafka_2.12-2.5.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.5.0" # 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 diff --git a/vagrant/base.sh b/vagrant/base.sh index 459d63c09dc01..e68f95a4fcc33 100755 --- a/vagrant/base.sh +++ b/vagrant/base.sh @@ -140,7 +140,7 @@ get_kafka 2.3.1 2.12 chmod a+rw /opt/kafka-2.3.1 get_kafka 2.4.1 2.12 chmod a+rw /opt/kafka-2.4.1 -get_kafka 2.5.0 2.13 +get_kafka 2.5.0 2.12 chmod a+rw /opt/kafka-2.5.0 # For EC2 nodes, we want to use /mnt, which should have the local disk. On local