From e66e0f14da0ab5ea63fbf8a0cf422506fc5a1328 Mon Sep 17 00:00:00 2001 From: Oren Leiman Date: Thu, 28 Sep 2023 17:58:47 -0700 Subject: [PATCH] ducktape: Update librdkafka and confluent-kafka to v2.2.0 For SASL reauth support The prebuilt confluent-kafka wheels do not include GSSAPI support, so confluent-kafka is now built from source explicitly when the ducktape container is built. Signed-off-by: Oren Leiman (cherry picked from commit e09c68ad40a23a9f15178615cbd053a2cde288d4) --- tests/docker/Dockerfile | 2 ++ tests/docker/ducktape-deps/librdkafka | 2 +- tests/setup.py | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 9ac1d66a1a1f..648969e22e92 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -211,6 +211,8 @@ COPY --chown=0:0 --chmod=0755 tests/setup.py /root/tests/ RUN python3 -m pip install --upgrade --force pip && \ python3 -m pip install --force --no-cache-dir -e /root/tests/ +RUN python3 -m pip install --force-reinstall --no-cache-dir --no-binary :all: confluent-kafka==2.2.0 + # seastar addrress to line utility depends on 'file' pkg RUN apt update && \ apt install -y file && \ diff --git a/tests/docker/ducktape-deps/librdkafka b/tests/docker/ducktape-deps/librdkafka index 6931427a0154..367bbc910df5 100644 --- a/tests/docker/ducktape-deps/librdkafka +++ b/tests/docker/ducktape-deps/librdkafka @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e mkdir /opt/librdkafka -curl -SL "https://github.com/confluentinc/librdkafka/archive/refs/tags/v2.0.2.tar.gz" | tar -xz --strip-components=1 -C /opt/librdkafka +curl -SL "https://github.com/confluentinc/librdkafka/archive/refs/tags/v2.2.0.tar.gz" | tar -xz --strip-components=1 -C /opt/librdkafka cd /opt/librdkafka ./configure make -j$(nproc) diff --git a/tests/setup.py b/tests/setup.py index 00012d9b9dc0..6b8b1a5dfbdb 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -15,9 +15,9 @@ install_requires=[ 'ducktape@git+https://github.com/redpanda-data/ducktape.git@fd01d72b8c82ae852986bb288c69818c7ffb4de8', 'prometheus-client==0.9.0', 'pyyaml==6.0', 'kafka-python==2.0.2', - 'crc32c==2.2', 'confluent-kafka==2.0.2', 'zstandard==0.15.2', - 'xxhash==2.0.2', 'protobuf==4.21.8', 'fastavro==1.4.9', - 'psutil==5.9.0', 'numpy==1.22.3', 'pygal==3.0', 'pytest==7.1.2', + 'crc32c==2.2', 'zstandard==0.15.2', 'xxhash==2.0.2', + 'protobuf==4.21.8', 'fastavro==1.4.9', 'psutil==5.9.0', + 'numpy==1.22.3', 'pygal==3.0', 'pytest==7.1.2', 'jump-consistent-hash==3.2.0', 'azure-storage-blob==12.14.1', 'kafkatest@git+https://github.com/apache/kafka.git@058589b03db686803b33052d574ce887fb5cfbd1#egg=kafkatest&subdirectory=tests', 'grpcio==1.57.0', 'grpcio-tools==1.57', 'grpcio-status==1.57.0',