diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a6200b5a58..beae8e47de 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,35 +22,35 @@ updates:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer"
schedule:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer"
schedule:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer"
schedule:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer"
schedule:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/LdapContainer"
schedule:
@@ -65,7 +65,7 @@ updates:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer"
schedule:
@@ -80,7 +80,7 @@ updates:
interval: "weekly"
ignore:
- dependency-name: "ubuntu"
- versions: [">=22.04"]
+ versions: [">=24.04"]
- package-ecosystem: "docker"
directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitLabContainer"
schedule:
diff --git a/Jenkinsfile b/Jenkinsfile
index 339a1f318c..1a20ec4422 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ if (needSplittingFromWorkspace) {
def axes = [
jenkinsVersions: ['lts', 'latest'],
platforms: ['linux'],
- jdks: [11, 21],
+ jdks: [17, 21],
browsers: ['firefox'],
]
diff --git a/pom.xml b/pom.xml
index eb55b7a52a..4ed69e3db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
org.jenkins-ci.test
docker-fixtures
- 190.vd6a_e600cb_775
+ 200.v22a_e8766731c
org.json
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer/Dockerfile
index 31760989e6..3e1eeedbb2 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer/Dockerfile
@@ -1,5 +1,5 @@
# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
-FROM jenkins/java:387404da3ce7
+FROM jenkins/java:978f1af53461
RUN cd /tmp && \
wget -nv -O - https://get.docker.com/builds/Linux/x86_64/docker-1.13.1.tgz | tar xvfz - docker/docker && \
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/FtpdContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/FtpdContainer/Dockerfile
index 1f1fb89a4f..4035ba8ab2 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/FtpdContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/FtpdContainer/Dockerfile
@@ -2,7 +2,7 @@
# Runs sshd and allow the 'test' user to login
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
# install FTP
RUN apt-get update && apt-get install -y vsftpd
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/Dockerfile
index 3d99567860..0df3a2a3e9 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/Dockerfile
@@ -3,7 +3,7 @@
# and prepares for execution of gitplugin tests.
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
RUN mkdir -p /var/run/sshd
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer/Dockerfile
index 2c68ec35c7..3d4466c374 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer/Dockerfile
@@ -2,10 +2,8 @@
# Setup Prosody IM XMPP Server with two users
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
-# Needed for supervisord
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
# install prosody
RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y prosody
RUN apt-get upgrade -y
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
index aa51ecb659..0fdf92fced 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile
@@ -3,7 +3,7 @@
# and prepares for execution of Java compile jobs on slaves.
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
RUN mkdir -p /var/run/sshd
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer/Dockerfile
index ddfa3b58dc..b970f503f8 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer/Dockerfile
@@ -3,7 +3,7 @@
#
# The initial password is 'admin:admin'
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
# Pin JIRA version to make the tests more predictable and less fragile
# In particular, pinned to 6.X because from 7.X the SOAP API is gone, and it's
@@ -12,11 +12,11 @@ FROM ubuntu:22.04
ENV JIRA_VERSION 6.3
# base package installation
-RUN apt-get update && apt-get install -y apt-transport-https wget gnupg2 && echo "deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable contrib" >> /etc/apt/sources.list
+RUN apt-get update && apt-get install -y apt-transport-https wget gnupg2 && add-apt-repository -s "deb https://packages.atlassian.com/debian/atlassian-sdk-deb/ stable contrib"
RUN wget https://packages.atlassian.com/api/gpg/key/public
RUN apt-key add public
-RUN apt-get update && apt-get install -y openjdk-8-jdk atlassian-plugin-sdk netcat
+RUN apt-get update && apt-get install -y openjdk-8-jdk atlassian-plugin-sdk netcat-openbsd
# this will install the whole thing, launches Tomcat,
# asks the user to do Ctrl+C to quit, then it shuts down presumably because it
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SMBContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SMBContainer/Dockerfile
index 0d4e94ae43..70f3e53400 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SMBContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SMBContainer/Dockerfile
@@ -2,9 +2,8 @@
# Runs smbd and allow the 'test' user to connect
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
RUN apt-get update && apt-get -y install samba
RUN useradd test -d /home/test -s /bin/bash && \
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile
index c563a7f1da..e65abf4af8 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile
@@ -1,4 +1,4 @@
# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
-FROM jenkins/java:387404da3ce7
+FROM jenkins/java:978f1af53461
COPY *.pub /tmp
RUN cat /tmp/*.pub >> /home/test/.ssh/authorized_keys
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container/Dockerfile
index 4da73083a8..52614064b6 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container/Dockerfile
@@ -4,13 +4,8 @@
# The admin user has username 'admin' and password 'tomcat'
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
-RUN apt-get update && apt-get install -y gnupg
-
-# Tomcat7 is from Universe
-RUN echo "deb http://archive.ubuntu.com/ubuntu lunar universe" >> /etc/apt/sources.list
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 40976EAF437D05B5
RUN apt-get update && apt-get install -y tomcat10 tomcat10-admin
# configure the admin user
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile
index ecedf2397c..7b45ce33a5 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile
@@ -1,6 +1,6 @@
# curl -s https://raw.githubusercontent.com/jenkinsci/docker-fixtures/master/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile | sha1sum | cut -c 1-12
-FROM jenkins/java:387404da3ce7
-RUN apt-get update && apt-get install -y vnc4server imagemagick
+FROM jenkins/java:978f1af53461
+RUN apt-get update && apt-get install -y tigervnc-standalone-server imagemagick
# So it is owned by root and has the permissions vncserver seems to require:
RUN mkdir /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix/