diff --git a/packaging/rpm-ostree.spec b/packaging/rpm-ostree.spec index 4e81da0e80..612d287c45 100644 --- a/packaging/rpm-ostree.spec +++ b/packaging/rpm-ostree.spec @@ -137,8 +137,6 @@ Requires: librepo%{?_isa} >= %{librepo_version} # rpm-ostree wraps more of ostree (such as `ostree admin unlock` etc.) Requires: ostree Requires: bubblewrap -# https://github.com/coreos/rpm-ostree/issues/4994 -Requires: bootc # We have been building with fuse but changed to fuse3 on: # https://src.fedoraproject.org/rpms/rpm-ostree/c/3c602a23787fd2df873c0b18df3133c9fec4b66a # However our code is just calling fuse's fusermount. diff --git a/tests/kolainst/destructive/client-layering-upgrade b/tests/kolainst/destructive/client-layering-upgrade index faa191240b..ec3275763f 100755 --- a/tests/kolainst/destructive/client-layering-upgrade +++ b/tests/kolainst/destructive/client-layering-upgrade @@ -20,6 +20,9 @@ set -xeuo pipefail . /etc/os-release case $VERSION_ID in + 41) kernel_release=6.11.1-300.fc41.x86_64 + koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2558200" + ;; 40) kernel_release=6.5.6-300.fc39.x86_64 koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2302642" ;; diff --git a/tests/vmcheck/test-override-kernel.sh b/tests/vmcheck/test-override-kernel.sh index 68918d8abc..c1b160b1fc 100755 --- a/tests/vmcheck/test-override-kernel.sh +++ b/tests/vmcheck/test-override-kernel.sh @@ -41,10 +41,10 @@ versionid=${versionid:11} # trim off VERSION_ID= current=$(vm_get_booted_csum) vm_cmd rpm-ostree db list "${current}" > current-dblist.txt case $versionid in - 40) kernel_release=6.5.6-300.fc39.x86_64 - koji_kernel_url=https://koji.fedoraproject.org/koji/buildinfo?buildID=2302642 + 41) kernel_release=6.11.1-300.fc41.x86_64 + koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2558200" ;; - 39) kernel_release=6.5.6-300.fc39.x86_64 + 40) kernel_release=6.5.6-300.fc39.x86_64 koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2302642" ;; *) assert_not_reached "Unsupported Fedora version: $versionid";; diff --git a/tests/vmcheck/test-override-replace-2.sh b/tests/vmcheck/test-override-replace-2.sh index 652dc57a13..7fd35db47a 100755 --- a/tests/vmcheck/test-override-replace-2.sh +++ b/tests/vmcheck/test-override-replace-2.sh @@ -159,10 +159,15 @@ case $versionid in # XXX: this isn't actually the gold selinux; that one is too old for # container-selinux and moby-engine. rather than trying to change multiple # packages, we use one that's in coreos-pool since that also prevents GC + 41) + evr=41.15-1.fc41 + koji_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2538477" + hack="https://koji.fedoraproject.org/koji/buildinfo?buildID=2415333" + ;; 40) evr=38.28-1.fc39 - koji_url=https://koji.fedoraproject.org/koji/buildinfo?buildID=2291271 - hack=https://koji.fedoraproject.org/koji/buildinfo?buildID=2291519 + koji_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2291271" + hack="https://koji.fedoraproject.org/koji/buildinfo?buildID=2291519" ;; 39) evr=38.28-1.fc39