Skip to content

Commit 3ce2f77

Browse files
committed
Reapply "manifests: enable cliwrap on Fedora 40+"
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
1 parent 72db29c commit 3ce2f77

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

manifests/cliwrap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# https://github.com/coreos/fedora-coreos-tracker/issues/730
2+
cliwrap: true

manifests/fedora-coreos.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ conditional-include:
3636
- if: releasever == 39
3737
# Checks for breaking changes that came with Podman v5.
3838
include: podman-v5.yaml
39+
- if: releasever >= 40
40+
include: cliwrap.yaml
3941

4042
ostree-layers:
4143
- overlay/15fcos

tests/kola/extensions/package

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,9 @@ if [[ -n "${failed}" ]]; then
5252
fatal "could not install: ${failed}"
5353
fi
5454
ok "successfully installed os rpm package extensions"
55+
56+
# also try the wrapped dnf
57+
if jq -e .cliwrap /usr/share/rpm-ostree/treefile.json; then
58+
dnf install -y 'ltrace'
59+
ok "dnf cliwrap"
60+
fi

tests/kola/rpm-ostree/kernel-replace

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
8787
version=$(rpm-ostree --version | grep Version)
8888
cat > Dockerfile << EOF
8989
FROM localhost/fcos
90-
RUN rpm-ostree cliwrap install-to-root /
90+
# until we have https://github.com/coreos/rpm-ostree/pull/4848
91+
RUN if test ! -d /usr/libexec/rpm-ostree/wrapped; then rpm-ostree cliwrap install-to-root /; fi
9192
RUN rpm-ostree override replace \
9293
https://koji.fedoraproject.org/koji/buildinfo?buildID=2178613 && \
9394
ostree container commit

0 commit comments

Comments
 (0)