From e7a3835946f4cef24fcde0c5460cbd1d5d6f9b59 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 14 Aug 2025 17:32:22 +0200 Subject: [PATCH] ci/tmt: distro-sync ostree+systemd This is a hackaround for https://gitlab.com/redhat/centos-stream/containers/bootc/-/issues/1174 Signed-off-by: Colin Walters --- Dockerfile | 2 ++ tmt/tests/bootc-install-provision.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 09d3dec6..c7b1d519 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,8 @@ case $ID in centos|rhel) dnf config-manager --set-enabled crb;; fedora) dnf -y install dnf-utils 'dnf5-command(builddep)';; esac +# Handle version skew, xref https://gitlab.com/redhat/centos-stream/containers/bootc/-/issues/1174 +dnf -y distro-sync ostree{,-libs} systemd dnf -y builddep /tmp/bootc.spec # Extra dependencies dnf -y install git-core diff --git a/tmt/tests/bootc-install-provision.sh b/tmt/tests/bootc-install-provision.sh index 6c9968c0..ca8f82dc 100755 --- a/tmt/tests/bootc-install-provision.sh +++ b/tmt/tests/bootc-install-provision.sh @@ -119,6 +119,8 @@ case $ID in centos|rhel) dnf config-manager --set-enabled crb;; fedora) dnf -y install dnf-utils 'dnf5-command(builddep)';; esac +# Handle version skew +dnf -y distro-sync ostree{,-libs} systemd dnf -y builddep contrib/packaging/bootc.spec # Extra dependencies dnf -y install git-core