From cf944c51891d0b5150e1dafe9adcc1e5f1676457 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Fri, 13 Dec 2024 05:40:32 +0100
Subject: [PATCH] workflows: Move to Ubuntu 24.04

This gets rid of the podman backport PPA, and thus finally runs the
integration test on the *exact* same machinery as the production build
(which previously has led to problems like in #628).

We can now also stop repeating the test dependencies.
---
 .github/workflows/build-tasks.yml |  4 ++--
 .github/workflows/tests.yml       | 15 +++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-tasks.yml b/.github/workflows/build-tasks.yml
index 57117322..88c25f75 100644
--- a/.github/workflows/build-tasks.yml
+++ b/.github/workflows/build-tasks.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         build:
           - label: amd64
-            runner: ubuntu-22.04
+            runner: ubuntu-24.04
           - label: arm64
             runner: buildjet-2vcpu-ubuntu-2204-arm
 
@@ -50,7 +50,7 @@ jobs:
   manifest:
     needs: build
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
 
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 167510e9..92113174 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,7 +2,7 @@ name: tests
 on: [pull_request]
 jobs:
   unit-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -11,14 +11,13 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y make python3-pyflakes python3-pycodestyle python3-pip python3-pytest
-          # `pip install .[test]` does not work properly on Ubuntu 22.04
-          sudo pip install ruff mypy types-PyYAML
+          sudo pip install .[test]
 
       - name: Run lint tests
         run: make check
 
   tasks:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       # enough permissions for tests-scan to work
       pull-requests: read
@@ -42,14 +41,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y make python3-pytest
 
-      # HACK: Ubuntu 22.04 has podman 3.4, which isn't compatible with podman-remote 4 in our tasks container
-      # This PPA is a backport of podman 4.3 from Debian 12; drop this when moving `runs-on:` to ubuntu-24.04
-      - name: Update to newer podman
-        run: |
-          sudo add-apt-repository -y ppa:quarckster/containers
-          sudo apt install -y podman
-          systemctl --user daemon-reload
-
       - name: Check which containers changed
         id: containers_changed
         run: |