From 4a34614571a28fd70730741e6c45abe63517bce2 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 20 May 2024 09:48:26 -0700 Subject: [PATCH] Upgrade test containers to Ubuntu 24.04 and Java 17 --- .github/dependabot.yml | 14 +++++++------- pom.xml | 2 +- .../fixtures/DockerAgentContainer/Dockerfile | 2 +- .../docker/fixtures/FtpdContainer/Dockerfile | 2 +- .../docker/fixtures/GitContainer/Dockerfile | 2 +- .../docker/fixtures/JabberContainer/Dockerfile | 4 ++-- .../docker/fixtures/JavaGitContainer/Dockerfile | 2 +- .../docker/fixtures/JiraContainer/Dockerfile | 2 +- .../docker/fixtures/SMBContainer/Dockerfile | 4 ++-- .../docker/fixtures/SshAgentContainer/Dockerfile | 2 +- .../docker/fixtures/Tomcat10Container/Dockerfile | 4 ++-- .../docker/fixtures/XvncSlaveContainer/Dockerfile | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) 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/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..f34125d6f5 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,10 @@ # 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 +RUN echo "deb http://archive.ubuntu.com/ubuntu noble 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..7099178cb5 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 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..07804cf5c2 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,9 @@ # 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 echo "deb http://archive.ubuntu.com/ubuntu noble 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..44a98327a0 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,12 +4,12 @@ # 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 echo "deb http://archive.ubuntu.com/ubuntu noble 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 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..0594d7bf9d 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,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 apt-get update && apt-get install -y vnc4server imagemagick # So it is owned by root and has the permissions vncserver seems to require: