From fb9e08e1d4308146fde0cd7ef8a173c861f1494e Mon Sep 17 00:00:00 2001
From: Sven Nierlein <sven@consol.de>
Date: Mon, 3 Feb 2025 19:34:46 +0100
Subject: [PATCH] github: update actions to ubuntu 24.04

---
 .ci/prepare_machine.sh               | 10 +++++++---
 .github/workflows/citest.yml         |  2 +-
 t/scenarios/citest/citest/Dockerfile |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.ci/prepare_machine.sh b/.ci/prepare_machine.sh
index e4ecbcd1a..7449b1621 100755
--- a/.ci/prepare_machine.sh
+++ b/.ci/prepare_machine.sh
@@ -4,6 +4,13 @@ set -ex
 
 export DEBIAN_FRONTEND="noninteractive"
 apt-get -y update
+
+apt-get -y update
+apt-get -y install apt-transport-https curl
+sh -c "echo 'deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] http://download.opensuse.org/repositories/home:/naemon:/daily/xUbuntu_$(lsb_release -rs)/ ./' >> /etc/apt/sources.list"
+curl -s -o /etc/apt/trusted.gpg.d/naemon.asc "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg"
+apt-get -y update
+
 apt-get -y install \
     debhelper \
     lsb-release \
@@ -68,9 +75,6 @@ apt-get -y install \
     chromium-browser \
     npm \
 
-echo "deb http://labs.consol.de/repo/stable/ubuntu $(lsb_release -cs) main" >> /etc/apt/sources.list
-wget -q "http://labs.consol.de/repo/stable/RPM-GPG-KEY" -O - | apt-key add -
-apt-get -y update
 apt-get -y install naemon-core naemon-livestatus
 chsh -s /bin/bash naemon
 ! grep docker /etc/group >/dev/null || gpasswd -a naemon docker
diff --git a/.github/workflows/citest.yml b/.github/workflows/citest.yml
index a12f9e874..6d79e7a1f 100644
--- a/.github/workflows/citest.yml
+++ b/.github/workflows/citest.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   citest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: perl -V
diff --git a/t/scenarios/citest/citest/Dockerfile b/t/scenarios/citest/citest/Dockerfile
index 4aff43457..69854af45 100644
--- a/t/scenarios/citest/citest/Dockerfile
+++ b/t/scenarios/citest/citest/Dockerfile
@@ -1,4 +1,4 @@
-FROM  ubuntu:20.04
+FROM  ubuntu:24.04
 
 RUN apt-get update; \
     DEBIAN_FRONTEND=noninteractive \