From c98b2c8fc8d8dea6f893d375a346d11d3dbffab3 Mon Sep 17 00:00:00 2001 From: yungh Date: Wed, 9 Oct 2024 18:14:13 +0800 Subject: [PATCH 1/2] KAFKA-17738: upgrade base image from jdk8 to jdk11 --- tests/README.md | 2 +- tests/docker/Dockerfile | 4 ++-- tests/docker/ducker-ak | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/README.md b/tests/README.md index 13cd9dcbd9a38..a442e9d6ac829 100644 --- a/tests/README.md +++ b/tests/README.md @@ -45,7 +45,7 @@ TC_PATHS="tests/kafkatest/tests/streams/streams_upgrade_test.py::StreamsUpgradeT ``` * Run tests with a specific image name ``` -image_name="ducker-ak-openjdk-8" bash tests/docker/run_tests.sh +image_name="ducker-ak-openjdk-11" bash tests/docker/run_tests.sh ``` * Run tests with a different JVM ``` diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 57b71bf4fd0a3..917f3e1dbe26b 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -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:11 FROM $jdk_version AS build-native-image WORKDIR /build @@ -60,7 +60,7 @@ ARG ducker_creator=default LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. -# we have to install git since it is included in openjdk:8 but not openjdk:11 +# we have to install git since it is not included in openjdk:11 RUN apt update && apt install -y sudo git netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python3-pip python3-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute iproute2 iputils-ping && apt-get -y clean RUN python3 -m pip install -U pip==21.1.1; # NOTE: ducktape 0.11.4 requires python3.9 diff --git a/tests/docker/ducker-ak b/tests/docker/ducker-ak index 21f0f64219469..2b7cdf554d2fe 100755 --- a/tests/docker/ducker-ak +++ b/tests/docker/ducker-ak @@ -45,7 +45,7 @@ docker_run_memory_limit="2000m" default_num_nodes=14 # The default OpenJDK base image. -default_jdk="openjdk:8" +default_jdk="openjdk:11" # The default ducker-ak image name. default_image_name="ducker-ak" From 3177bd15605433ee1ab4df190623c7608edf259a Mon Sep 17 00:00:00 2001 From: yungh Date: Wed, 9 Oct 2024 23:27:23 +0800 Subject: [PATCH 2/2] Remove the unnecessary comment --- tests/docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 917f3e1dbe26b..5585a7672570d 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -60,7 +60,6 @@ ARG ducker_creator=default LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. -# we have to install git since it is not included in openjdk:11 RUN apt update && apt install -y sudo git netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python3-pip python3-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute iproute2 iputils-ping && apt-get -y clean RUN python3 -m pip install -U pip==21.1.1; # NOTE: ducktape 0.11.4 requires python3.9