kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbej...@apache.org
Subject [kafka] branch 2.2 updated: HOTFIX: bump system test versions (#7835)
Date Tue, 17 Dec 2019 21:46:05 GMT
This is an automated email from the ASF dual-hosted git repository.

bbejeck pushed a commit to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.2 by this push:
     new bc0a649  HOTFIX: bump system test versions (#7835)
bc0a649 is described below

commit bc0a649d89d8e464c750867109c5c4e7f1da5508
Author: A. Sophie Blee-Goldman <sophie@confluent.io>
AuthorDate: Tue Dec 17 13:45:04 2019 -0800

    HOTFIX: bump system test versions (#7835)
    
    Bumped kafkatest/version.py to 2.2.3-SNAPSHOT
    Updated versions following instructions in streams_upgrade_test.py
    
    Reviewers: Bill Bejeck <bbejeck@gmail.com>
---
 gradle/dependencies.gradle                            | 2 ++
 tests/docker/Dockerfile                               | 2 ++
 tests/kafkatest/services/streams.py                   | 4 ++--
 tests/kafkatest/tests/streams/streams_upgrade_test.py | 4 ++--
 tests/kafkatest/version.py                            | 6 ++++--
 vagrant/base.sh                                       | 2 ++
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index b0d2534..29ca5d3 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -75,6 +75,7 @@ versions += [
   kafka_11: "1.1.1",
   kafka_20: "2.0.1",
   kafka_21: "2.1.1",
+  kafka_22: "2.2.2",
   lz4: "1.5.0",
   mavenArtifact: "3.6.0",
   metrics: "2.2.0",
@@ -130,6 +131,7 @@ libs += [
   kafkaStreams_11: "org.apache.kafka:kafka-streams:$versions.kafka_11",
   kafkaStreams_20: "org.apache.kafka:kafka-streams:$versions.kafka_20",
   kafkaStreams_21: "org.apache.kafka:kafka-streams:$versions.kafka_21",
+  kafkaStreams_22: "org.apache.kafka:kafka-streams:$versions.kafka_22",
   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 7aeed24..e765309 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -55,6 +55,7 @@ RUN mkdir -p "/opt/kafka-1.0.2" && chmod a+rw /opt/kafka-1.0.2 &&
curl -s "$KAFK
 RUN mkdir -p "/opt/kafka-1.1.1" && chmod a+rw /opt/kafka-1.1.1 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.1.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-1.1.1"
 RUN mkdir -p "/opt/kafka-2.0.1" && chmod a+rw /opt/kafka-2.0.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-2.0.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.0.1"
 RUN mkdir -p "/opt/kafka-2.1.1" && chmod a+rw /opt/kafka-2.1.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-2.1.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-2.1.1"
+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"
 
 # 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
@@ -65,6 +66,7 @@ RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.0.2-test.jar" -o /opt/kafka-1.0.2/lib
 RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.1.1-test.jar" -o /opt/kafka-1.1.1/libs/kafka-streams-1.1.1-test.jar
 RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.0.1-test.jar" -o /opt/kafka-2.0.1/libs/kafka-streams-2.0.1-test.jar
 RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.1.1-test.jar" -o /opt/kafka-2.1.1/libs/kafka-streams-2.1.1-test.jar
+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
 
 # The version of Kibosh to use for testing.
 # If you update this, also update vagrant/base.sy
diff --git a/tests/kafkatest/services/streams.py b/tests/kafkatest/services/streams.py
index 771b67f..b6d4107 100644
--- a/tests/kafkatest/services/streams.py
+++ b/tests/kafkatest/services/streams.py
@@ -21,7 +21,7 @@ from ducktape.utils.util import wait_until
 from kafkatest.directory_layout.kafka_path import KafkaPathResolverMixin
 from kafkatest.services.kafka import KafkaConfig
 from kafkatest.services.monitor.jmx import JmxMixin
-from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, LATEST_0_11_0,
LATEST_1_0, LATEST_1_1, LATEST_2_0, LATEST_2_1
+from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, LATEST_0_11_0,
LATEST_1_0, LATEST_1_1, LATEST_2_0, LATEST_2_1, LATEST_2_2
 
 STATE_DIR = "state.dir"
 
@@ -483,7 +483,7 @@ class StreamsUpgradeTestJobRunnerService(StreamsTestBaseService):
         args = self.args.copy()
         if self.KAFKA_STREAMS_VERSION in [str(LATEST_0_10_0), str(LATEST_0_10_1), str(LATEST_0_10_2),
                                           str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1),
-                                          str(LATEST_2_0), str(LATEST_2_1)]:
+                                          str(LATEST_2_0), str(LATEST_2_1), str(LATEST_2_2)]:
             args['kafka'] = self.kafka.bootstrap_servers()
         else:
             args['kafka'] = ""
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index a220019..7051da8 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -24,7 +24,7 @@ from kafkatest.services.streams import StreamsSmokeTestDriverService, StreamsSmo
     StreamsUpgradeTestJobRunnerService
 from kafkatest.services.zookeeper import ZookeeperService
 from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, LATEST_0_11_0,
LATEST_1_0, LATEST_1_1, \
-    LATEST_2_0, LATEST_2_1, DEV_BRANCH, DEV_VERSION, KafkaVersion
+    LATEST_2_0, LATEST_2_1, LATEST_2_2, DEV_BRANCH, DEV_VERSION, KafkaVersion
 
 # broker 0.10.0 is not compatible with newer Kafka Streams versions
 broker_upgrade_versions = [str(LATEST_0_10_1), str(LATEST_0_10_2), str(LATEST_0_11_0), str(LATEST_1_0),
str(LATEST_1_1), str(LATEST_2_0), str(LATEST_2_1), str(DEV_BRANCH)]
@@ -54,7 +54,7 @@ which are outlined here:
    "StreamsUpgradeTestJobRunnerService" on line 484 to make sure the correct arguments are
passed
    during the system test run.
    
-3. Update the vagrant/bash.sh file to include all new versions, including the newly released
version
+3. Update the vagrant/base.sh file to include all new versions, including the newly released
version
    and all point releases for existing releases.  You only need to list the latest version
in 
    this file.
    
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 715ab6e..b5f1deb 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -60,7 +60,7 @@ def get_version(node=None):
         return DEV_BRANCH
 
 DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("2.2.2-SNAPSHOT")
+DEV_VERSION = KafkaVersion("2.2.3-SNAPSHOT")
 
 # 0.8.2.x versions
 V_0_8_2_1 = KafkaVersion("0.8.2.1")
@@ -121,4 +121,6 @@ LATEST_2_1 = V_2_1_1
 
 # 2.2.x versions
 V_2_2_0 = KafkaVersion("2.2.0")
-LATEST_2_2 = V_2_2_0
+V_2_2_1 = KafkaVersion("2.2.1")
+V_2_2_2 = KafkaVersion("2.2.2")
+LATEST_2_2 = V_2_2_2
diff --git a/vagrant/base.sh b/vagrant/base.sh
index 433cdc3..8b43cf6 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -131,6 +131,8 @@ get_kafka 2.0.1 2.12
 chmod a+rw /opt/kafka-2.0.1
 get_kafka 2.1.1 2.12
 chmod a+rw /opt/kafka-2.1.1
+get_kafka 2.2.2 2.12
+chmod a+rw /opt/kafka-2.2.2
 
 
 # For EC2 nodes, we want to use /mnt, which should have the local disk. On local


Mime
View raw message