Skip to content

Commit

Permalink
Reapply "manifests: enable cliwrap on Fedora 40+"
Browse files Browse the repository at this point in the history
This reverts commit 3789b06.

The reported issue that motivated the revert[[1]] is due to an
rpm-ostree bug[[2]].

We can trivially work around this bug until the rpm-ostree fix lands in
FCOS, so let's do that and re-enable cliwrap.

[1]: coreos/fedora-coreos-tracker#1679
[2]: coreos/rpm-ostree#4848
  • Loading branch information
jlebon committed Feb 29, 2024
1 parent 72db29c commit 3ce2f77
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
2 changes: 2 additions & 0 deletions manifests/cliwrap.yaml
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
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
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
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

0 comments on commit 3ce2f77

Please sign in to comment.