Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions tests/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG jdk_version=openjdk:8
ARG jdk_version=openjdk:8-buster
FROM $jdk_version

MAINTAINER Apache Kafka dev@kafka.apache.org
Expand All @@ -32,9 +32,13 @@ 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 cmake pkg-config libfuse-dev iperf traceroute && apt-get -y clean
RUN apt update
RUN apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute

# Install python 2 and pip
RUN apt install -y python2.7-dev python-pip
RUN python -m pip install -U pip==9.0.3;
RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.17
RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade "ducktape>0.7,<0.8"

# Set up ssh
COPY ./ssh-config /root/.ssh/config
Expand Down Expand Up @@ -84,6 +88,9 @@ ARG KIBOSH_VERSION="8841dd392e6fbf02986e2fb1f1ebf04df344b65a"
RUN apt-get install fuse
RUN cd /opt && git clone -q https://github.com/confluentinc/kibosh.git && cd "/opt/kibosh" && git reset --hard $KIBOSH_VERSION && mkdir "/opt/kibosh/build" && cd "/opt/kibosh/build" && ../configure && make -j 2

# clean apt cache
RUN apt-get -y clean

# 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/ /var/log/ && echo "PATH=$(runuser -l ducker -c 'echo $PATH'):$JAVA_HOME/bin" >> /home/ducker/.ssh/environment && echo 'PATH=$PATH:'"$JAVA_HOME/bin" >> /home/ducker/.profile && echo 'ducker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
USER ducker
Expand Down
3 changes: 2 additions & 1 deletion tests/docker/ducker-ak
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ docker_run_memory_limit="2000m"
default_num_nodes=14

# The default OpenJDK base image.
default_jdk="openjdk:8"
# set to debian buster as it's the last one to support python 2 (sigh)
default_jdk="openjdk:8-buster"

# The default ducker-ak image name.
default_image_name="ducker-ak"
Expand Down
2 changes: 1 addition & 1 deletion tests/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def run_tests(self):
license="apache2.0",
packages=find_packages(),
include_package_data=True,
install_requires=["ducktape==0.7.17", "requests==2.22.0"],
install_requires=["ducktape>0.7,<0.8", "requests==2.22.0"],
tests_require=["pytest", "mock"],
cmdclass={'test': PyTest},
)