Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: Updates for f41 #5155

Merged
merged 2 commits into from
Nov 8, 2024
+13 −7
Merged

tests: Updates for f41 #5155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe3cd8
tests: Updates for f41
jmarrero Nov 7, 2024
f1ec843
Revert "packaging: Require bootc"
jmarrero Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packaging/rpm-ostree.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions tests/kolainst/destructive/client-layering-upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down
6 changes: 3 additions & 3 deletions tests/vmcheck/test-override-kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";;
Expand Down
9 changes: 7 additions & 2 deletions tests/vmcheck/test-override-replace-2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading