kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ewe...@apache.org
Subject kafka git commit: KAFKA-5623: ducktape kafka service: do not assume Service contains num_nodes
Date Fri, 21 Jul 2017 02:34:31 GMT
Repository: kafka
Updated Branches:
  refs/heads/0.11.0 930eefdab -> b0ff6ea9a


KAFKA-5623: ducktape kafka service: do not assume Service contains num_nodes

…m_nodes

Author: Colin P. Mccabe <cmccabe@confluent.io>

Reviewers: Ewen Cheslack-Postava <ewen@confluent.io>

Closes #3557 from cmccabe/KAFKA-5623

(cherry picked from commit 9ae09e80591f2deec3b89686dee5752a6be4adc7)
Signed-off-by: Ewen Cheslack-Postava <me@ewencp.org>


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b0ff6ea9
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b0ff6ea9
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b0ff6ea9

Branch: refs/heads/0.11.0
Commit: b0ff6ea9aa1c2a9c2fc02b5fc5674efa74ef6ee4
Parents: 930eefd
Author: Colin P. Mccabe <cmccabe@confluent.io>
Authored: Thu Jul 20 19:34:16 2017 -0700
Committer: Ewen Cheslack-Postava <me@ewencp.org>
Committed: Thu Jul 20 19:34:26 2017 -0700

----------------------------------------------------------------------
 tests/docker/Dockerfile                 | 7 ++++---
 tests/kafkatest/services/kafka/kafka.py | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/b0ff6ea9/tests/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index add1734..0cf123c 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -17,7 +17,7 @@ FROM openjdk:8
 
 MAINTAINER Apache Kafka dev@kafka.apache.org
 VOLUME ["/opt/kafka-dev"]
-ENV MIRROR="http://apache.cs.utah.edu/"
+ENV MIRROR="http://mirror.olnevhost.net/pub/apache/"
 
 # Set the timezone.
 ENV TZ="/usr/share/zoneinfo/America/Los_Angeles"
@@ -32,14 +32,15 @@ ARG ducker_creator=default
 LABEL ducker.creator=$ducker_creator
 
 # Update Linux and install necessary utilities.
-RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils
openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev && apt-get
-y clean
-RUN pip install -U pip && pip install --upgrade cffi virtualenv pyasn1 &&
pip install --upgrade ducktape==0.6.0
+RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils
openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config
libfuse-dev && apt-get -y clean
+RUN pip install -U pip && pip install --upgrade cffi virtualenv pyasn1 Sphinx sphinx-argparse
sphinx-rtd-theme boto3 pycrypto pywinrm && pip install --upgrade ducktape==0.6.0
 
 # Set up ssh
 COPY ./ssh-config /root/.ssh/config
 RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && cp -f /root/.ssh/id_rsa.pub
/root/.ssh/authorized_keys
 
 # Install binary test dependencies.
+ENV MIRROR="http://mirrors.ocf.berkeley.edu/apache/"
 RUN mkdir -p "/opt/kafka-0.8.2.2" && curl -s "${MIRROR}kafka/0.8.2.2/kafka_2.10-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" && curl -s "${MIRROR}kafka/0.9.0.1/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/0.10.0.1/kafka_2.11-0.10.0.1.tgz"
| tar xz --strip-components=1 -C "/opt/kafka-0.10.0.1"

http://git-wip-us.apache.org/repos/asf/kafka/blob/b0ff6ea9/tests/kafkatest/services/kafka/kafka.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/services/kafka/kafka.py b/tests/kafkatest/services/kafka/kafka.py
index 7e4a589..b22b518 100644
--- a/tests/kafkatest/services/kafka/kafka.py
+++ b/tests/kafkatest/services/kafka/kafka.py
@@ -89,6 +89,7 @@ class KafkaService(KafkaPathResolverMixin, JmxMixin, Service):
         self.zk_set_acl = False
         self.server_prop_overides = server_prop_overides
         self.log_level = "DEBUG"
+        self.num_nodes = num_nodes
 
         #
         # In a heavily loaded and not very fast machine, it is


Mime
View raw message