Updated Jenkins with test for Ubuntu "resolute". Updated dockerfiles to not use depricated MAINTAINER cmd

jgaa · jgaa · commit a8cd803d097f · 2026-06-07T09:53:31.000+03:00
diff --git a/ci/jenkins/Dockefile.debian-bookworm b/ci/jenkins/Dockefile.debian-bookworm
@@ -1,6 +1,6 @@
 FROM debian:bookworm
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 # In case you need proxy
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
diff --git a/ci/jenkins/Dockefile.debian-bullseye b/ci/jenkins/Dockefile.debian-bullseye
@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 # In case you need proxy
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
diff --git a/ci/jenkins/Dockefile.debian-testing b/ci/jenkins/Dockefile.debian-testing
@@ -1,6 +1,6 @@
 FROM debian:testing
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 # In case you need proxy
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
diff --git a/ci/jenkins/Dockefile.ubuntu-jammy b/ci/jenkins/Dockefile.ubuntu-jammy
@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
     DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
diff --git a/ci/jenkins/Dockefile.ubuntu-xenial b/ci/jenkins/Dockefile.ubuntu-xenial
@@ -1,6 +1,6 @@
 FROM ubuntu:xenial
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 # In case you need proxy
 #RUN echo 'Acquire::http::Proxy "http://127.0.0.1:8080";' >> /etc/apt/apt.conf
diff --git a/ci/jenkins/Dockerfile.centos7 b/ci/jenkins/Dockerfile.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 RUN echo "root:password" | chpasswd
 
diff --git a/ci/jenkins/Dockerfile.debian-trixie b/ci/jenkins/Dockerfile.debian-trixie
@@ -1,6 +1,6 @@
 FROM debian:trixie
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 # In case you need proxy
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
diff --git a/ci/jenkins/Dockerfile.fedora b/ci/jenkins/Dockerfile.fedora
@@ -1,6 +1,6 @@
 FROM fedora:latest
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 RUN dnf -q update -y &&\
     dnf -q upgrade -y &&\
diff --git a/ci/jenkins/Dockerfile.ubuntu-noble b/ci/jenkins/Dockerfile.ubuntu-noble
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
     DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
diff --git a/ci/jenkins/Dockerfile.ubuntu-plucky b/ci/jenkins/Dockerfile.ubuntu-plucky
@@ -1,6 +1,6 @@
 FROM ubuntu:25.04
 
-MAINTAINER Jarle Aase <jgaa@jgaa.com>
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
 
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
     DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
diff --git a/ci/jenkins/Dockerfile.ubuntu-resolute b/ci/jenkins/Dockerfile.ubuntu-resolute
@@ -0,0 +1,23 @@
+FROM ubuntu:26.04
+
+LABEL maintainer="Jarle Aase <jgaa@jgaa.com>"
+
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
+    DEBIAN_FRONTEND="noninteractive" apt-get -y -q --no-install-recommends upgrade &&\
+    DEBIAN_FRONTEND="noninteractive" apt-get install -y -q openssh-server g++ git gpgv \
+    automake autoconf build-essential rapidjson-dev \
+    zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
+    default-jdk &&\
+    apt-get -y -q autoremove &&\
+    apt-get -y -q clean
+
+# Set user jenkins to the image
+RUN useradd -m -d /home/jenkins -s /bin/sh jenkins &&\
+    echo "jenkins:jenkins" | chpasswd &&\
+    mkdir -p /run/sshd
+
+# Standard SSH port
+EXPOSE 22
+
+# Default command
+CMD ["/usr/sbin/sshd", "-D"]
diff --git a/ci/jenkins/Jenkinsfile.groovy b/ci/jenkins/Jenkinsfile.groovy
@@ -189,6 +189,74 @@ pipeline {
                     }
                 }
 
+                stage('Ubuntu Resolute') {
+                    agent {
+                        dockerfile {
+                            filename 'Dockerfile.ubuntu-resolute'
+                            dir 'ci/jenkins'
+                            label 'docker'
+                            args '-u root'
+                        }
+                    }
+
+                    options {
+                        timeout(time: 60, unit: "MINUTES")
+                    }
+
+                    steps {
+                        echo "Building on ubuntu-resolute-AMD64 in ${NODE_NAME} --> ${WORKSPACE}"
+                        checkout scm
+                        sh 'pwd; ls -la'
+                        sh 'rm -rf build'
+                        sh 'mkdir build'
+                        sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release  .. && make -j $(nproc)'
+
+                        echo 'Getting ready to run tests'
+                        script {
+                            try {
+                                sh 'cd build && ctest --no-compress-output -T Test'
+                            } catch (exc) {
+
+                                unstable(message: "${STAGE_NAME} - Testing failed")
+                            }
+                        }
+                    }
+                }
+
+                stage('Ubuntu Resolute MT CTX') {
+                    agent {
+                        dockerfile {
+                            filename 'Dockerfile.ubuntu-resolute'
+                            dir 'ci/jenkins'
+                            label 'docker'
+                            args '-u root'
+                        }
+                    }
+
+                    options {
+                        timeout(time: 60, unit: "MINUTES")
+                    }
+
+                    steps {
+                        echo "Building on ubuntu-resolute-AMD64 in ${NODE_NAME} --> ${WORKSPACE}"
+                        checkout scm
+                        sh 'pwd; ls -la'
+                        sh 'rm -rf build'
+                        sh 'mkdir build'
+                        sh 'cd build && cmake -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release .. && make -j $(nproc)'
+
+                        echo 'Getting ready to run tests'
+                        script {
+                            try {
+                                sh 'cd build && ctest --no-compress-output -T Test'
+                            } catch (exc) {
+
+                                unstable(message: "${STAGE_NAME} - Testing failed")
+                            }
+                        }
+                    }
+                }
+
                 stage('Ubuntu Jammy') {
                     agent {
                         dockerfile {
@@ -671,4 +739,3 @@ pipeline {
         }
     }
 }
-
diff --git a/ci/mock-backends/json/Dockerfile b/ci/mock-backends/json/Dockerfile
@@ -1,7 +1,7 @@
 # Original from https://github.com/clue/docker-json-server
 
 FROM node:latest
-MAINTAINER Jarle Aase <jarle@jgaa.com>
+LABEL maintainer="Jarle Aase <jarle@jgaa.com>"
 
 RUN npm install -g json-server
 
diff --git a/ci/mock-backends/squid/Dockerfile b/ci/mock-backends/squid/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:trixie
-MAINTAINER jarle@jgaa.com
+LABEL maintainer="jarle@jgaa.com"
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends upgrade \
diff --git a/tests/mock-json/Dockerfile b/tests/mock-json/Dockerfile
@@ -1,7 +1,7 @@
 # Original from https://github.com/clue/docker-json-server
 
 FROM node:latest
-MAINTAINER Jarle Aase <jarle@jgaa.com>
+LABEL maintainer="Jarle Aase <jarle@jgaa.com>"
 
 RUN npm install -g json-server
 
diff --git a/tests/mock-squid/Dockerfile b/tests/mock-squid/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian
-MAINTAINER jarle@jgaa.com
+LABEL maintainer="jarle@jgaa.com"
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends upgrade \
