This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch 1.0
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/1.0 by this push:
new 032a249 MINOR:Updates for new versions and upgrade tests (#5607)
032a249 is described below
commit 032a2496c36ff789623d7d022508ea435384efcd
Author: Bill Bejeck <bbej...@gmail.com>
AuthorDate: Tue Sep 4 17:56:55 2018 -0400
MINOR:Updates for new versions and upgrade tests (#5607)
Reviewers: Guozhang Wang <wangg...@gmail.com>
---
bin/kafka-run-class.sh | 2 +-
gradle/dependencies.gradle | 4 ++--
tests/docker/Dockerfile | 4 ++--
tests/kafkatest/tests/streams/streams_upgrade_test.py | 16 +++++++++-------
tests/kafkatest/version.py | 13 ++++++++-----
vagrant/base.sh | 8 ++++----
6 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index 81b423a..a606945 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -111,7 +111,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 776a385..484cecb 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -61,8 +61,8 @@ 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_0102: "0.10.2.2",
+ kafka_0110: "0.11.0.3",
lz4: "1.4",
metrics: "2.2.0",
// PowerMock 1.x doesn't support Java 9, so use PowerMock 2.0.0 beta
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index 6fe05ff..921b524 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -45,8 +45,8 @@ RUN mkdir -p "/opt/kafka-0.8.2.2" && curl -s
"${MIRROR}/kafka_2.10-0.8.2.2.tgz"
RUN mkdir -p "/opt/kafka-0.9.0.1" && curl -s
"${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.1" && curl -s
"${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.1" && curl -s
"${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.1" && curl -s
"${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.2" && curl -s
"${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-0.10.2.2" && curl -s
"${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" && curl -s
"${MIRROR}/kafka_2.11-0.11.0.3.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.11.0.3"
# Set up the ducker user.
RUN useradd -ms /bin/bash ducker && mkdir -p /home/ducker/ && rsync -aiq
/root/.ssh/ /home/ducker/.ssh && chown -R ducker /home/ducker/ /mnt/ && echo
'ducker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py
b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index e97bbb7..2a7911d 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -13,15 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import random
+import time
+from ducktape.mark import matrix, parametrize
from ducktape.mark.resource import cluster
from ducktape.tests.test import Test
-from ducktape.mark import ignore, matrix, parametrize
from kafkatest.services.kafka import KafkaService
+from kafkatest.services.streams import StreamsSmokeTestDriverService, \
+ StreamsSmokeTestJobRunnerService, StreamsUpgradeTestJobRunnerService
from kafkatest.services.zookeeper import ZookeeperService
-from kafkatest.services.streams import StreamsSmokeTestDriverService,
StreamsSmokeTestJobRunnerService, StreamsUpgradeTestJobRunnerService
-from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2,
LATEST_0_11_0, DEV_BRANCH, DEV_VERSION, KafkaVersion
-import random
-import time
+from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2, \
+ LATEST_0_11_0, DEV_BRANCH, DEV_VERSION, KafkaVersion
broker_upgrade_versions = [str(LATEST_0_10_1), str(LATEST_0_10_2),
str(LATEST_0_11_0), str(DEV_BRANCH)]
simple_upgrade_versions_metadata_version_2 = [str(LATEST_0_10_1),
str(LATEST_0_10_2), str(LATEST_0_11_0), str(DEV_VERSION)]
@@ -166,8 +168,8 @@ class StreamsUpgradeTest(Test):
self.driver.stop()
#@parametrize(new_version=str(LATEST_0_10_1)) we cannot run this test
until Kafka 0.10.1.2 is released
- #@parametrize(new_version=str(LATEST_0_10_2)) we cannot run this test
until Kafka 0.10.2.2 is released
- #@parametrize(new_version=str(LATEST_0_11_0)) we cannot run this test
until Kafka 0.11.0.3 is released
+ @parametrize(new_version=str(LATEST_0_10_2))
+ @parametrize(new_version=str(LATEST_0_11_0))
@parametrize(new_version=str(DEV_VERSION))
def test_metadata_upgrade(self, new_version):
"""
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 2b4c8dd..3faa519 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,10 +94,13 @@ 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.0 versions
V_1_0_0 = KafkaVersion("1.0.0")
-LATEST_1_0 = V_1_0_0
+V_1_0_1 = KafkaVersion("1.0.1")
+V_1_0_2 = KafkaVersion("1.0.2")
+LATEST_1_0 = V_1_0_2
LATEST_1 = LATEST_1_0
diff --git a/vagrant/base.sh b/vagrant/base.sh
index 0be9eaf..d77ed40 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -91,10 +91,10 @@ 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 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
# For EC2 nodes, we want to use /mnt, which should have the local disk. On
local
