This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.0 by this push:
new 032f531 MINOR: Enable ignored upgrade system tests 2.0 (#5614)
032f531 is described below
commit 032f5319148080ca20adc297594664c8829f7d10
Author: Bill Bejeck <[email protected]>
AuthorDate: Thu Sep 6 16:07:37 2018 -0400
MINOR: Enable ignored upgrade system tests 2.0 (#5614)
Reviewers: John Roesler <[email protected]>, Matthias J. Sax
<[email protected]>, Guozhang Wang <[email protected]>
---
bin/kafka-run-class.sh | 2 +-
gradle/dependencies.gradle | 8 +++----
tests/docker/Dockerfile | 28 +++++++---------------
.../tests/streams/streams_upgrade_test.py | 12 ++++------
tests/kafkatest/version.py | 15 +++++++-----
vagrant/base.sh | 16 ++++++-------
6 files changed, 35 insertions(+), 46 deletions(-)
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index f33342e..eed3955 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -107,7 +107,7 @@ else
for file in
"$base_dir"/streams/upgrade-system-tests-$SHORT_VERSION_NO_DOTS/build/libs/kafka-streams-upgrade-system-tests*.jar;
do
if should_include_file "$file"; then
- CLASSPATH="$CLASSPATH":"$file"
+ CLASSPATH="$file":"$CLASSPATH"
fi
done
fi
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index a22bc5f..573bc23 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -66,10 +66,10 @@ versions += [
junit: "4.12",
kafka_0100: "0.10.0.1",
kafka_0101: "0.10.1.1",
- kafka_0102: "0.10.2.1",
- kafka_0110: "0.11.0.2",
- kafka_10: "1.0.1",
- kafka_11: "1.1.0",
+ kafka_0102: "0.10.2.2",
+ kafka_0110: "0.11.0.3",
+ kafka_10: "1.0.2",
+ kafka_11: "1.1.1",
lz4: "1.4.1",
mavenArtifact: "3.5.3",
metrics: "2.2.0",
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index f1239a91..11c6fb6 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -43,32 +43,20 @@ RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && cp
-f /root/.ssh/id_rsa.p
ARG KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages";
RUN mkdir -p "/opt/kafka-0.8.2.2" && chmod a+rw /opt/kafka-0.8.2.2 && curl -s
"$KAFKA_MIRROR/kafka_2.11-0.8.2.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.8.2.2"
RUN mkdir -p "/opt/kafka-0.9.0.1" && chmod a+rw /opt/kafka-0.9.0.1 && curl -s
"$KAFKA_MIRROR/kafka_2.11-0.9.0.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.9.0.1"
-RUN mkdir -p "/opt/kafka-0.10.0.0" && chmod a+rw /opt/kafka-0.10.0.0 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.0.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.0.0"
RUN mkdir -p "/opt/kafka-0.10.0.1" && chmod a+rw /opt/kafka-0.10.0.1 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.0.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.0.1"
-RUN mkdir -p "/opt/kafka-0.10.1.0" && chmod a+rw /opt/kafka-0.10.1.0 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.1.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.1.0"
RUN mkdir -p "/opt/kafka-0.10.1.1" && chmod a+rw /opt/kafka-0.10.1.1 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.1.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.1.1"
-RUN mkdir -p "/opt/kafka-0.10.2.0" && chmod a+rw /opt/kafka-0.10.2.0 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.2.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.2.0"
-RUN mkdir -p "/opt/kafka-0.10.2.1" && chmod a+rw /opt/kafka-0.10.2.1 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.2.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.2.1"
-RUN mkdir -p "/opt/kafka-0.11.0.0" && chmod a+rw /opt/kafka-0.11.0.0 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.11.0.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.11.0.0"
-RUN mkdir -p "/opt/kafka-0.11.0.1" && chmod a+rw /opt/kafka-0.11.0.1 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.11.0.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.11.0.1"
-RUN mkdir -p "/opt/kafka-0.11.0.2" && chmod a+rw /opt/kafka-0.11.0.2 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.11.0.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.11.0.2"
-RUN mkdir -p "/opt/kafka-1.0.0" && chmod a+rw /opt/kafka-1.0.0 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.0.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-1.0.0"
-RUN mkdir -p "/opt/kafka-1.0.1" && chmod a+rw /opt/kafka-1.0.1 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.0.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-1.0.1"
-RUN mkdir -p "/opt/kafka-1.1.0" && chmod a+rw /opt/kafka-1.1.0 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.1.0.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-1.1.0"
+RUN mkdir -p "/opt/kafka-0.10.2.2" && chmod a+rw /opt/kafka-0.10.2.2 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.10.2.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.10.2.2"
+RUN mkdir -p "/opt/kafka-0.11.0.3" && chmod a+rw /opt/kafka-0.11.0.3 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.11.0.3.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.11.0.3"
+RUN mkdir -p "/opt/kafka-1.0.2" && chmod a+rw /opt/kafka-1.0.2 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.0.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-1.0.2"
+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"
# Streams test dependencies
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.0.0-test.jar" -o
/opt/kafka-0.10.0.0/libs/kafka-streams-0.10.0.0-test.jar
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
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.1.0-test.jar" -o
/opt/kafka-0.10.1.0/libs/kafka-streams-0.10.1.0-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.1.1-test.jar" -o
/opt/kafka-0.10.1.1/libs/kafka-streams-0.10.1.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.2.0-test.jar" -o
/opt/kafka-0.10.2.0/libs/kafka-streams-0.10.2.0-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.2.1-test.jar" -o
/opt/kafka-0.10.2.1/libs/kafka-streams-0.10.2.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.11.0.0-test.jar" -o
/opt/kafka-0.11.0.0/libs/kafka-streams-0.11.0.0-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.11.0.1-test.jar" -o
/opt/kafka-0.11.0.1/libs/kafka-streams-0.11.0.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.11.0.2-test.jar" -o
/opt/kafka-0.11.0.2/libs/kafka-streams-0.11.0.2-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.0.0-test.jar" -o
/opt/kafka-1.0.0/libs/kafka-streams-1.0.0-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.0.1-test.jar" -o
/opt/kafka-1.0.1/libs/kafka-streams-1.0.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.1.0-test.jar" -o
/opt/kafka-1.1.0/libs/kafka-streams-1.1.0-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.10.2.2-test.jar" -o
/opt/kafka-0.10.2.2/libs/kafka-streams-0.10.2.2-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.11.0.3-test.jar" -o
/opt/kafka-0.11.0.3/libs/kafka-streams-0.11.0.3-test.jar
+RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.0.2-test.jar" -o
/opt/kafka-1.0.2/libs/kafka-streams-1.0.2-test.jar
+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
# The version of Kibosh to use for testing.
# If you update this, also update vagrant/base.sy
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py
b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index 4113467..aca4881 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -15,7 +15,7 @@
import random
import time
-from ducktape.mark import ignore, matrix
+from ducktape.mark import matrix
from ducktape.mark.resource import cluster
from ducktape.tests.test import Test
from kafkatest.services.kafka import KafkaService
@@ -28,10 +28,10 @@ broker_upgrade_versions = [str(LATEST_0_10_1),
str(LATEST_0_10_2), str(LATEST_0_
metadata_1_versions = [str(LATEST_0_10_0)]
metadata_2_versions = [str(LATEST_0_10_1), str(LATEST_0_10_2),
str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1)]
-# we can add the following versions to
`backward_compatible_metadata_2_versions` after the corresponding
-# bug-fix release 0.10.1.2, 0.10.2.2, 0.11.0.3, 1.0.2, and 1.1.1 are available:
-# str(LATEST_0_10_1), str(LATEST_0_10_2), str(LATEST_0_11_0), str(LATEST_1_0),
str(LATEST_1_1)
-backward_compatible_metadata_2_versions = []
+# once 0.10.0.1.2 is released we can replace
+# backward_compatible_metadata_2_versions with metadata_2_versions
+
+backward_compatible_metadata_2_versions = [str(LATEST_0_10_2),
str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1)]
metadata_3_versions = [str(DEV_VERSION)]
class StreamsUpgradeTest(Test):
@@ -57,7 +57,6 @@ class StreamsUpgradeTest(Test):
node.version = KafkaVersion(to_version)
self.kafka.start_node(node)
- @ignore
@cluster(num_nodes=6)
@matrix(from_version=broker_upgrade_versions,
to_version=broker_upgrade_versions)
def test_upgrade_downgrade_brokers(self, from_version, to_version):
@@ -125,7 +124,6 @@ class StreamsUpgradeTest(Test):
node.account.ssh("grep ALL-RECORDS-DELIVERED %s" %
self.driver.STDOUT_FILE, allow_fail=False)
self.processor1.node.account.ssh_capture("grep
SMOKE-TEST-CLIENT-CLOSED %s" % self.processor1.STDOUT_FILE, allow_fail=False)
- @ignore
@matrix(from_version=metadata_2_versions, to_version=metadata_2_versions)
def test_simple_upgrade_downgrade(self, from_version, to_version):
"""
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 82891bc..830b1c9 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -14,9 +14,8 @@
# limitations under the License.
-from kafkatest.utils import kafkatest_version
-
from distutils.version import LooseVersion
+from kafkatest.utils import kafkatest_version
class KafkaVersion(LooseVersion):
@@ -86,7 +85,8 @@ LATEST_0_10_1 = V_0_10_1_1
# 0.10.2.x versions
V_0_10_2_0 = KafkaVersion("0.10.2.0")
V_0_10_2_1 = KafkaVersion("0.10.2.1")
-LATEST_0_10_2 = V_0_10_2_1
+V_0_10_2_2 = KafkaVersion("0.10.2.2")
+LATEST_0_10_2 = V_0_10_2_2
LATEST_0_10 = LATEST_0_10_2
@@ -94,17 +94,20 @@ LATEST_0_10 = LATEST_0_10_2
V_0_11_0_0 = KafkaVersion("0.11.0.0")
V_0_11_0_1 = KafkaVersion("0.11.0.1")
V_0_11_0_2 = KafkaVersion("0.11.0.2")
-LATEST_0_11_0 = V_0_11_0_2
+V_0_11_0_3 = KafkaVersion("0.11.0.3")
+LATEST_0_11_0 = V_0_11_0_3
LATEST_0_11 = LATEST_0_11_0
# 1.0.x versions
V_1_0_0 = KafkaVersion("1.0.0")
V_1_0_1 = KafkaVersion("1.0.1")
-LATEST_1_0 = V_1_0_1
+V_1_0_2 = KafkaVersion("1.0.2")
+LATEST_1_0 = V_1_0_2
# 1.1.x versions
V_1_1_0 = KafkaVersion("1.1.0")
-LATEST_1_1 = V_1_1_0
+V_1_1_1 = KafkaVersion("1.1.1")
+LATEST_1_1 = V_1_1_1
# 2.0.x versions
V_2_0_0 = KafkaVersion("2.0.0")
diff --git a/vagrant/base.sh b/vagrant/base.sh
index c16225d..dcba0a1 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -111,14 +111,14 @@ get_kafka 0.10.0.1 2.11
chmod a+rw /opt/kafka-0.10.0.1
get_kafka 0.10.1.1 2.11
chmod a+rw /opt/kafka-0.10.1.1
-get_kafka 0.10.2.1 2.11
-chmod a+rw /opt/kafka-0.10.2.1
-get_kafka 0.11.0.2 2.11
-chmod a+rw /opt/kafka-0.11.0.2
-get_kafka 1.0.1 2.11
-chmod a+rw /opt/kafka-1.0.1
-get_kafka 1.1.0 2.11
-chmod a+rw /opt/kafka-1.1.0
+get_kafka 0.10.2.2 2.11
+chmod a+rw /opt/kafka-0.10.2.2
+get_kafka 0.11.0.3 2.11
+chmod a+rw /opt/kafka-0.11.0.3
+get_kafka 1.0.2 2.11
+chmod a+rw /opt/kafka-1.0.2
+get_kafka 1.1.1 2.11
+chmod a+rw /opt/kafka-1.1.1
# For EC2 nodes, we want to use /mnt, which should have the local disk. On
local
