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

Reapply "manifests: enable cliwrap on Fedora 40+" #2887

Closed
wants to merge 2 commits into from
Closed

Reapply "manifests: enable cliwrap on Fedora 40+" #2887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ce2f77
Reapply "manifests: enable cliwrap on Fedora 40+"
jlebon Feb 29, 2024
9968717
cliwrap: only wrap `dnf` and `kernel-install`
jlebon Feb 29, 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: 2 additions & 0 deletions manifests/cliwrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# https://github.com/coreos/fedora-coreos-tracker/issues/730
cliwrap: true
2 changes: 2 additions & 0 deletions manifests/fedora-coreos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ conditional-include:
- if: releasever == 39
# Checks for breaking changes that came with Podman v5.
include: podman-v5.yaml
- if: releasever >= 40
include: cliwrap.yaml

ostree-layers:
- overlay/15fcos
Expand Down
6 changes: 6 additions & 0 deletions tests/kola/extensions/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ if [[ -n "${failed}" ]]; then
fatal "could not install: ${failed}"
fi
ok "successfully installed os rpm package extensions"

# also try the wrapped dnf
if jq -e .cliwrap /usr/share/rpm-ostree/treefile.json; then
dnf install -y 'ltrace'
ok "dnf cliwrap"
fi
3 changes: 2 additions & 1 deletion tests/kola/rpm-ostree/kernel-replace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
version=$(rpm-ostree --version | grep Version)
cat > Dockerfile << EOF
FROM localhost/fcos
RUN rpm-ostree cliwrap install-to-root /
# until we have https://github.com/coreos/rpm-ostree/pull/4848
RUN if test ! -d /usr/libexec/rpm-ostree/wrapped; then rpm-ostree cliwrap install-to-root /; fi
RUN rpm-ostree override replace \
https://koji.fedoraproject.org/koji/buildinfo?buildID=2178613 && \
ostree container commit
Expand Down
Loading