From b83c622b3fb8a5f1cbfaf39cf35f3cb0f9f17743 Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvollmer@redhat.com>
Date: Tue, 11 Oct 2022 12:04:09 +0300
Subject: [PATCH 1/2] images: Include the "clevis" package set in Fedora and
 RHEL images

The tests for fixing the system configuration for NBDE will want to
install them.
---
 images/scripts/fedora.setup | 11 +++++++++++
 images/scripts/rhel.setup   | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/images/scripts/fedora.setup b/images/scripts/fedora.setup
index 816a951adb..5615fb2754 100755
--- a/images/scripts/fedora.setup
+++ b/images/scripts/fedora.setup
@@ -108,6 +108,14 @@ libreport-plugin-bugzilla \
 libreport-fedora
 "
 
+# These packages are downloaded to the image so that the tests can
+# install them on-demand.
+
+PACKAGE_SET_CLEVIS="\
+clevis-systemd
+clevis-dracut
+"
+
 # avoid NM-wait-online hanging on disconnected interfaces
 mkdir -p /etc/NetworkManager/conf.d/
 printf '[main]\nno-auto-default=*\n' > /etc/NetworkManager/conf.d/noauto.conf
@@ -131,6 +139,9 @@ fi
 dnf $DNF_OPTS -y upgrade
 dnf $DNF_OPTS -y install $TEST_PACKAGES $COCKPIT_DEPS $IPA_CLIENT_PACKAGES $ABRT_PACKAGES
 
+mkdir -p /var/lib/package-sets/clevis
+dnf $DNF_OPTS download --downloaddir=/var/lib/package-sets/clevis $PACKAGE_SET_CLEVIS
+
 # Pre-install distribution cockpit packages, for testing cockpit extensions offline and for convenient interactive debugging
 dnf --setopt=install_weak_deps=False install -y cockpit
 
diff --git a/images/scripts/rhel.setup b/images/scripts/rhel.setup
index 840d8f903e..f517ee7ff3 100755
--- a/images/scripts/rhel.setup
+++ b/images/scripts/rhel.setup
@@ -188,8 +188,19 @@ if [ "$IMAGE" = "centos-8-stream" ]; then
     TEST_PACKAGES="${TEST_PACKAGES/kpatch-dnf /}"
 fi
 
+# These packages are downloaded to the image so that the tests can
+# install them on-demand.
+
+PACKAGE_SET_CLEVIS="\
+clevis-systemd
+clevis-dracut
+"
+
 dnf install -y $TEST_PACKAGES $COCKPIT_DEPS $IPA_CLIENT_PACKAGES
 
+mkdir -p /var/lib/package-sets/clevis
+dnf download --downloaddir=/var/lib/package-sets/clevis $PACKAGE_SET_CLEVIS
+
 # we only need cloud-init for the initial boot, afterwards it just slows down booting
 if rpm -q cloud-init; then
     dnf remove -y cloud-init

From 67567baba12b29c2259c4e693e123e69a835d63b Mon Sep 17 00:00:00 2001
From: Cockpituous <cockpituous@cockpit-project.org>
Date: Mon, 17 Oct 2022 13:25:36 +0000
Subject: [PATCH 2/2] images: Update fedora-36 image

---
 images/fedora-36 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/fedora-36 b/images/fedora-36
index 721cbfe5d3..faa5d9e3c4 120000
--- a/images/fedora-36
+++ b/images/fedora-36
@@ -1 +1 @@
-fedora-36-d35abd9e826bc63517b6f4fd9bd81703bcbf0bf37f089de0edc49014cf89dfd2.qcow2
\ No newline at end of file
+fedora-36-cce6d988dabba817b951630555d3121637ce1384268ad136a080043be88b72ff.qcow2
\ No newline at end of file