[sysadmin/ci-images] /: TestContainers, which is the underlying container framework used by akonadi-e2e-tests is not a huge fan of Podman.
Ben Cooksley <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 23afd5c73f2d67d5d40cfd97e1bd792d3092f148 by Ben Cooksley.
Committed on 15/08/2026 at 05:13.
Pushed by bcooksley into branch 'master'.
TestContainers, which is the underlying container framework used by akonadi-e2e-tests is not a huge fan of Podman.
Use real Docker instead to keep it happy
M +6 -1 suse-qt611/build.sh
M +6 -1 suse-qt612/build.sh
https://invent.kde.org/sysadmin/ci-images/-/commit/23afd5c73f2d67d5d40cfd97e1bd792d3092f148
diff --git a/suse-qt611/build.sh b/suse-qt611/build.sh
index f45cb66..3f64aa5 100755
--- a/suse-qt611/build.sh
+++ b/suse-qt611/build.sh
@@ -277,7 +277,7 @@ packages=(
# akonadi
mariadb qt6-sql-mysql
# akonadi-e2e-tests
- podman
+ docker
python3-uv
# kdepim-runtime
libetebase-devel
@@ -543,8 +543,13 @@ echo "vkms" > /etc/modules-load.d/vkms.conf
# and a render node
echo "vgem" > /etc/modules-load.d/vgem.conf
+# Ensure Docker starts by default
+systemctl enable docker.service
+
# Make sure user can read the journal. Useful for debugging tests that interact with system components.
usermod --append --groups systemd-journal user
+# Grant user access to Docker
+usermod --append --groups docker user
# Install Gitlab Runner
wget -q -O /usr/local/bin/gitlab-runner https://s3.dualstack.us-east-1.amazonaws.com/gitlab-runner-downloads/latest/binaries/gitlab-runner-linux-amd64
diff --git a/suse-qt612/build.sh b/suse-qt612/build.sh
index 205617e..2046d3f 100755
--- a/suse-qt612/build.sh
+++ b/suse-qt612/build.sh
@@ -277,7 +277,7 @@ packages=(
# akonadi
mariadb qt6-sql-mysql
# akonadi-e2e-tests
- podman
+ docker
python3-uv
# kdepim-runtime
libetebase-devel
@@ -544,8 +544,13 @@ echo "vkms" > /etc/modules-load.d/vkms.conf
# and a render node
echo "vgem" > /etc/modules-load.d/vgem.conf
+# Ensure Docker starts by default
+systemctl enable docker.service
+
# Make sure user can read the journal. Useful for debugging tests that interact with system components.
usermod --append --groups systemd-journal user
+# Grant user access to Docker
+usermod --append --groups docker user
# Install Gitlab Runner
wget -q -O /usr/local/bin/gitlab-runner https://s3.dualstack.us-east-1.amazonaws.com/gitlab-runner-downloads/latest/binaries/gitlab-runner-linux-amd64