From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 29 Jan 2023 14:17:06 +0000 (+0100)
Subject: mkosi: Add back CentOS Stream 8 to CI
X-Git-Tag: v253-rc2~41^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868c318ba3657b4d77ce08241f568694288b6f99;p=thirdparty%2Fsystemd.git

mkosi: Add back CentOS Stream 8 to CI

It's still useful to test the EFI handover logic in systemd-boot.
We use a mkosi.prepare script to install a newer python and update
the system to use it.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 4b77be24b40..86321c06234 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -74,10 +74,12 @@ jobs:
             release: tumbleweed
           - distro: centos
             release: "9"
+          - distro: centos
+            release: "8"
 
     steps:
     - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-    - uses: systemd/mkosi@37c0524360ee460174f83081fa14e0dc9bc6ee0d
+    - uses: systemd/mkosi@f36983f552a197faf9e36361cc68a297e68bee73
 
     - name: Configure
       run: |
diff --git a/mkosi.prepare b/mkosi.prepare
new file mode 100755
index 00000000000..9d377cf716c
--- /dev/null
+++ b/mkosi.prepare
@@ -0,0 +1,19 @@
+#!/bin/sh
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -e
+
+if [ "$(grep '^ID=' /etc/os-release)" = "ID=\"centos\"" ] && [ "$(grep '^VERSION=' /etc/os-release)" = "VERSION=\"8\"" ]; then
+    # python39-pluggy is a pytest dependency that's not installed for some reason.
+    dnf \
+        -y \
+        --enablerepo=powertools \
+         --setopt=powertools.module_hotfixes=true \
+         install \
+         python39 \
+         python39-pefile \
+         python39-jinja2 \
+         python39-pytest \
+         python39-pluggy
+    alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
+    alternatives --set python3 /usr/bin/python3.9
+fi