This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 76a2e620d9b IGNITE-26026 [ducktests] Migrate to eclipse-temurin JDK
docker image (#12220)
76a2e620d9b is described below
commit 76a2e620d9bcf287a7dd6641572fa6191e84e631
Author: Sergey Korotkov <[email protected]>
AuthorDate: Thu Jul 31 23:20:49 2025 +0700
IGNITE-26026 [ducktests] Migrate to eclipse-temurin JDK docker image
(#12220)
---
modules/ducktests/tests/docker/Dockerfile | 15 ++++++++++-----
modules/ducktests/tests/docker/requirements.txt | 3 +--
modules/ducktests/tests/docker/run_tests.sh | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/modules/ducktests/tests/docker/Dockerfile
b/modules/ducktests/tests/docker/Dockerfile
index 46eb5cfaa9a..1a6b87e60b5 100644
--- a/modules/ducktests/tests/docker/Dockerfile
+++ b/modules/ducktests/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:11
+ARG jdk_version=eclipse-temurin:11
FROM $jdk_version
MAINTAINER Apache Ignite [email protected]
@@ -34,8 +34,10 @@ LABEL ducker.creator=$ducker_creator
# Update Linux and install necessary utilities.
RUN cat /etc/apt/sources.list | sed
's/http:\/\/deb.debian.org/https:\/\/deb.debian.org/g' >
/etc/apt/sources.list.2 && mv /etc/apt/sources.list.2 /etc/apt/sources.list
-RUN apt update && apt install -y sudo 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 mc && apt-get -y clean
-RUN python3 -m pip install -U pip==24.3.1;
+RUN apt update && apt install -y sudo netcat-traditional iptables rsync unzip
wget curl jq coreutils openssh-server net-tools vim python3-pip python3-dev
python3-venv libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf
traceroute mc git && apt-get -y clean
+
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
COPY ./requirements.txt /root/requirements.txt
RUN pip3 install -r /root/requirements.txt
@@ -83,12 +85,15 @@ RUN cd /opt && curl -OL
https://github.com/jiaqi/jmxterm/releases/download/v$JMX
&& mv $JMXTERM_ARTIFACT $JMXTERM_NAME.jar
# Set up the ducker user.
-RUN useradd -ms /bin/bash ducker \
+RUN userdel -r ubuntu \
+ && useradd -ms /bin/bash ducker \
&& mkdir -p /home/ducker/ \
&& rsync -aiq /root/.ssh/ /home/ducker/.ssh \
&& chown -R ducker /home/ducker/ /mnt/ /var/log/ /opt \
+ && cp /dev/null /etc/environment \
&& echo "LANG=C.UTF-8" >> /home/ducker/.ssh/environment \
- && echo "PATH=$(runuser -l ducker -c 'echo $PATH'):$JAVA_HOME/bin" >>
/home/ducker/.ssh/environment \
+ && echo "PATH=$(runuser -l ducker -c 'echo
$PATH'):$JAVA_HOME/bin:/opt/venv/bin" >> /home/ducker/.ssh/environment \
+ && echo "JAVA_HOME=$JAVA_HOME" >> /home/ducker/.ssh/environment \
&& echo 'PATH=$PATH:'"$JAVA_HOME/bin" >> /home/ducker/.profile \
&& echo 'ducker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
USER ducker
diff --git a/modules/ducktests/tests/docker/requirements.txt
b/modules/ducktests/tests/docker/requirements.txt
index c290b9ec8ac..e07096d488a 100644
--- a/modules/ducktests/tests/docker/requirements.txt
+++ b/modules/ducktests/tests/docker/requirements.txt
@@ -14,5 +14,4 @@
# limitations under the License.
filelock==3.8.2
-ducktape==0.12.0
-psutil==5.7.2
+ducktape==0.13.0
diff --git a/modules/ducktests/tests/docker/run_tests.sh
b/modules/ducktests/tests/docker/run_tests.sh
index d06215bdaad..697d1e8d33c 100755
--- a/modules/ducktests/tests/docker/run_tests.sh
+++ b/modules/ducktests/tests/docker/run_tests.sh
@@ -25,7 +25,7 @@ IGNITE_NUM_CONTAINERS=${IGNITE_NUM_CONTAINERS:-13}
# Image name to run nodes
JDK_VERSION="${JDK_VERSION:-11}"
-IMAGE_PREFIX="ducker-ignite-openjdk"
+IMAGE_PREFIX="ducker-ignite-eclipse-temurin"
###
# DuckerTest parameters are specified with options to the script
@@ -137,7 +137,7 @@ done
if [ -z "$IMAGE_NAME" ]; then
IMAGE_NAME="$IMAGE_PREFIX-$JDK_VERSION"
- "$SCRIPT_DIR"/ducker-ignite build -j "openjdk:$JDK_VERSION" $IMAGE_NAME ||
die "ducker-ignite build failed"
+ "$SCRIPT_DIR"/ducker-ignite build -j "eclipse-temurin:$JDK_VERSION"
$IMAGE_NAME || die "ducker-ignite build failed"
else
echo "[WARN] Used non-default image $IMAGE_NAME. Be sure you use actual
version of the image. " \
"Otherwise build it with 'ducker-ignite build' command"
