Skip to content

Commit c1b0a19

Browse files
authored
Merge pull request #1515 from cgwalters/testing-farm-sync
ci/tmt: distro-sync ostree
2 parents 531cee5 + e7a3835 commit c1b0a19

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ case $ID in
5252
centos|rhel) dnf config-manager --set-enabled crb;;
5353
fedora) dnf -y install dnf-utils 'dnf5-command(builddep)';;
5454
esac
55+
# Handle version skew, xref https://gitlab.com/redhat/centos-stream/containers/bootc/-/issues/1174
56+
dnf -y distro-sync ostree{,-libs} systemd
5557
dnf -y builddep /tmp/bootc.spec
5658
# Extra dependencies
5759
dnf -y install git-core

tmt/tests/bootc-install-provision.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ case $ID in
119119
centos|rhel) dnf config-manager --set-enabled crb;;
120120
fedora) dnf -y install dnf-utils 'dnf5-command(builddep)';;
121121
esac
122+
# Handle version skew
123+
dnf -y distro-sync ostree{,-libs} systemd
122124
dnf -y builddep contrib/packaging/bootc.spec
123125
# Extra dependencies
124126
dnf -y install git-core

0 commit comments

Comments
 (0)