From 3ce2f779fb1b3b0014b3f5311e5cc0549bb6cc83 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 28 Feb 2024 21:29:58 -0500
Subject: [PATCH] Reapply "manifests: enable cliwrap on Fedora 40+"

This reverts commit 3789b068627af980a3914fbab42153adc2df5815.

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]: https://github.com/coreos/fedora-coreos-tracker/issues/1679
[2]: https://github.com/coreos/rpm-ostree/pull/4848
---
 manifests/cliwrap.yaml               | 2 ++
 manifests/fedora-coreos.yaml         | 2 ++
 tests/kola/extensions/package        | 6 ++++++
 tests/kola/rpm-ostree/kernel-replace | 3 ++-
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 manifests/cliwrap.yaml

diff --git a/manifests/cliwrap.yaml b/manifests/cliwrap.yaml
new file mode 100644
index 0000000000..8a2b7d4692
--- /dev/null
+++ b/manifests/cliwrap.yaml
@@ -0,0 +1,2 @@
+# https://github.com/coreos/fedora-coreos-tracker/issues/730
+cliwrap: true
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index f5948d8fe3..f0bf5af9ea 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -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
diff --git a/tests/kola/extensions/package b/tests/kola/extensions/package
index 92539d8ac5..f457d2170b 100755
--- a/tests/kola/extensions/package
+++ b/tests/kola/extensions/package
@@ -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
diff --git a/tests/kola/rpm-ostree/kernel-replace b/tests/kola/rpm-ostree/kernel-replace
index 82dd80716e..83d56f1086 100755
--- a/tests/kola/rpm-ostree/kernel-replace
+++ b/tests/kola/rpm-ostree/kernel-replace
@@ -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