feat: focal -> noble, add bookworm

dockerfiles/focal.docker → dockerfiles/bookworm.docker

-FROM ubuntu:focal
+FROM debian:bookworm
 ENV http_proxy ${http_proxy}
 ENV https_proxy ${https_proxy}
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
     apt-get install -y software-properties-common apt-utils && \
-    add-apt-repository -y universe && \
-    add-apt-repository -y ppa:git-core/ppa && \
     apt-get install -y wget && \
-    wget https://apt.llvm.org/llvm-snapshot.gpg.key && \
-    apt-key add llvm-snapshot.gpg.key && \
-    add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main' && \
     apt-get update && \
     apt-get upgrade -y && \
     apt-get dist-upgrade -y && \
-    apt-get install -y sudo python3-pip locales pigz \
+    apt-get install -y sudo pipx locales pigz \
         g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build \
         libboost-all-dev libxml++2.6-dev \
         patchelf \
@@ -22,11 +17,11 @@ RUN apt-get update && \
         libpam0g-dev \
         libreadline-dev \
         qtbase5-dev \
-        python2.7-dev python-numpy python3-dev python3-numpy \
-        python-pytest python3-coverage \
+        python3-dev python3-numpy \
+        python3-pytest python3-coverage \
         libxmu6 csh libxrandr2 \
-        libncurses5-dev \
-        linux-headers-generic \
+        libncurses5-dev &&\
+    apt-get install -y linux-headers-generic \
         graphviz \
         clang clang-14 clang-format-14 \
         libhdf5-dev \
@@ -36,8 +31,8 @@ RUN apt-get update && \
         libssl-dev \
         libpqxx-dev \
         libfftw3-dev \
-        subversion \
-        vim-common \
+        subversion && \
+    apt-get install -y vim-common \
         netcat-openbsd \
         libarmadillo-dev \
         libjsoncpp-dev \
@@ -49,13 +44,13 @@ RUN apt-get update && \
         libyajl-dev \
         libmodbus-dev \
         nlohmann-json3-dev \
-        libmbedtls-dev \
-        libjpeg-dev \
         libtirpc-dev \
+        libjpeg-dev \
+        libmbedtls-dev \
+        meson \
         socat && \
     useradd -u 30996 msk_jenkins && \
-    ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3 && \
-    pip3 install meson
+    ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
 
 # NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
 

dockerfiles/yocto-builder.docker

-FROM ubuntu:focal
+FROM ubuntu:noble
 ENV http_proxy ${http_proxy}
 ENV https_proxy ${https_proxy}
 ENV DEBIAN_FRONTEND noninteractive

scripts/login_docker_dragon.sh

@@ -2,7 +2,7 @@
 
 if [ $# != 1 -a $# != 2 -a $# != 3 ]; then
   echo "Usage: ./login_docker.sh <label> [<buildType> [<jobName>]]"
-  echo "  <label> denomiates the Linux system name, e.g. focal, tubleweed etc."
+  echo "  <label> denomiates the Linux system name, e.g. noble, tubleweed etc."
   echo "  <jobName> denomiates a cmake project name whose build artefact should be unpacked into the container."
   echo "  <buildType> denonminates the build type to retreive the job and artefacts for, i.e. debug, release, asan or tsan."
   exit 1

scripts/update_documentation

@@ -5,7 +5,7 @@ SECONDS=0
 
 source ${HOME}/dragon/bin/setup.sh
 
-CODENAME="focal"
+CODENAME="noble"
 BUILDTYPE="release"
 USE_RUN="${CODENAME}/${BUILDTYPE}"
 USE_RUN_TAG="${CODENAME}/tag"

vars/dragon_builds.groovy

@@ -3,16 +3,17 @@
  * It will always not find it although the same syntax has worked in different context.
  */
 def getBuilds() {
-    return ['focal-debug',
-            'focal-release',
-            'focal-tsan',
-            'focal-asan',
-            'noble-debug',
+    return ['noble-debug',
+            'noble-release',
+            'noble-tsan',
+            'noble-asan',
+            'bookworm-debug',
+            'bookworm-release',
             'tumbleweed-debug',
             'tumbleweed-release',
-            'focal-tag']
+            'noble-tag']
 }
 
 def getArtefactsDir() {
     return '/home/msk_jenkins/dragon-artefacts'
-}
+}
\ No newline at end of file

vars/dragon_nightly.groovy

@@ -4,7 +4,7 @@
 
   The idea is to run all builds and tests within the single Dragon Nightly job (all projects sequentially) and
   generate artefacts containing the build directories (including log files) for each project and build type (like
-  focal-Debug or tumbleweed-Release). Once this is complete, a so-called reporter job for each project (but not per
+  noble-Debug or tumbleweed-Release). Once this is complete, a so-called reporter job for each project (but not per
   build type) is created and triggered, which will pick up the artefacts for the corresponding job and publish the
   result (as if the build/test would have been run inside that reporter job).