From 64551a3ddfc2a98601531b46fb43770925ded62a Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Wed, 7 Feb 2024 13:55:35 +0100
Subject: [PATCH 1/3] Rename rpm-ostree-container running on Silverblue
 accordingly

---
 ...container.ks.in => rpm-ostree-container-silverblue.ks.in | 6 +++++-
 ...stree-container.sh => rpm-ostree-container-silverblue.sh | 0
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename rpm-ostree-container.ks.in => rpm-ostree-container-silverblue.ks.in (80%)
 rename rpm-ostree-container.sh => rpm-ostree-container-silverblue.sh (100%)

diff --git a/rpm-ostree-container.ks.in b/rpm-ostree-container-silverblue.ks.in
similarity index 80%
rename from rpm-ostree-container.ks.in
rename to rpm-ostree-container-silverblue.ks.in
index ce8f78cd..8abb7d55 100644
--- a/rpm-ostree-container.ks.in
+++ b/rpm-ostree-container-silverblue.ks.in
@@ -1,6 +1,10 @@
-#test name: rpm-ostree-container
+#test name: rpm-ostree-container-silverblue
 # https://github.com/rhinstaller/anaconda/pull/4617
 
+# Test that ostreecontainer ks command works on Silverblue.
+# Tests only installation of the palyload.
+# Does not test that the installation is bootable.
+
 # Use the default settings.
 %ksappend common/common_no_payload.ks
 
diff --git a/rpm-ostree-container.sh b/rpm-ostree-container-silverblue.sh
similarity index 100%
rename from rpm-ostree-container.sh
rename to rpm-ostree-container-silverblue.sh

From 415fcfaf70a761ffcb22367dcbce2eeb15ca7ad5 Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Wed, 7 Feb 2024 13:51:19 +0100
Subject: [PATCH 2/3] Make rpm-ostree-container-rhel9 usable also for Fedora

---
 .../platform/fedora_rawhide/payload/ostreecontainer.ks |  1 +
 fragments/platform/rhel9/payload/ostreecontainer.ks    |  1 +
 rpm-ostree-container-rhel9.ks.in                       | 10 ++++++++--
 rpm-ostree-container-rhel9.sh                          |  2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 fragments/platform/fedora_rawhide/payload/ostreecontainer.ks
 create mode 100644 fragments/platform/rhel9/payload/ostreecontainer.ks

diff --git a/fragments/platform/fedora_rawhide/payload/ostreecontainer.ks b/fragments/platform/fedora_rawhide/payload/ostreecontainer.ks
new file mode 100644
index 00000000..7b175a55
--- /dev/null
+++ b/fragments/platform/fedora_rawhide/payload/ostreecontainer.ks
@@ -0,0 +1 @@
+ostreecontainer --no-signature-verification --transport=registry --url=quay.io/centos-bootc/fedora-bootc:eln
diff --git a/fragments/platform/rhel9/payload/ostreecontainer.ks b/fragments/platform/rhel9/payload/ostreecontainer.ks
new file mode 100644
index 00000000..0036cca0
--- /dev/null
+++ b/fragments/platform/rhel9/payload/ostreecontainer.ks
@@ -0,0 +1 @@
+ostreecontainer --no-signature-verification --transport=registry --url=quay.io/centos-bootc/centos-bootc:stream9
diff --git a/rpm-ostree-container-rhel9.ks.in b/rpm-ostree-container-rhel9.ks.in
index 3135a34e..42a5f63f 100644
--- a/rpm-ostree-container-rhel9.ks.in
+++ b/rpm-ostree-container-rhel9.ks.in
@@ -8,13 +8,19 @@
 %ksappend common/common_no_payload.ks
 
 # Set up the RPM OSTree source.
-ostreecontainer --no-signature-verification --transport=registry --url=quay.io/centos-bootc/centos-bootc:stream9
+%ksappend payload/ostreecontainer.ks
 
 %post
 
+if [[ "@KSTEST_OS_NAME@" == "rhel" ]]; then
+    EXPECTED_URL="quay.io/centos-bootc/centos-bootc:stream9"
+else
+    EXPECTED_URL="quay.io/centos-bootc/fedora-bootc:eln"
+fi
+
 # Check the url of the remote.
 url="$(ostree remote show-url default)"
-if [ "${url}" != "quay.io/centos-bootc/centos-bootc:stream9" ]; then
+if [ "${url}" != "${EXPECTED_URL}" ]; then
     echo "Unexpected URL: ${url}" >> /root/RESULT
 fi
 
diff --git a/rpm-ostree-container-rhel9.sh b/rpm-ostree-container-rhel9.sh
index 47042071..74ca32ae 100755
--- a/rpm-ostree-container-rhel9.sh
+++ b/rpm-ostree-container-rhel9.sh
@@ -19,7 +19,7 @@
 
 # Ignore unused variable parsed out by tooling scripts as test tags metadata
 # shellcheck disable=SC2034
-TESTTYPE="payload ostree skip-on-rhel-8 skip-on-fedora"
+TESTTYPE="payload ostree skip-on-rhel-8"
 
 . ${KSTESTDIR}/functions.sh
 

From 1503309ea52d97ae29434b7ed527d043f7f95fa7 Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Wed, 7 Feb 2024 13:57:07 +0100
Subject: [PATCH 3/3] Make rpm-ostree-container-rhel9 no more platform specific

---
 ...ostree-container-rhel9.ks.in => rpm-ostree-container.ks.in | 4 ++--
 rpm-ostree-container-rhel9.sh => rpm-ostree-container.sh      | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename rpm-ostree-container-rhel9.ks.in => rpm-ostree-container.ks.in (88%)
 rename rpm-ostree-container-rhel9.sh => rpm-ostree-container.sh (100%)

diff --git a/rpm-ostree-container-rhel9.ks.in b/rpm-ostree-container.ks.in
similarity index 88%
rename from rpm-ostree-container-rhel9.ks.in
rename to rpm-ostree-container.ks.in
index 42a5f63f..d1963ab5 100644
--- a/rpm-ostree-container-rhel9.ks.in
+++ b/rpm-ostree-container.ks.in
@@ -1,7 +1,7 @@
-#test name: rpm-ostree-container-rhel9
+#test name: rpm-ostree-container
 # https://github.com/rhinstaller/anaconda/pull/5399
 #
-# Test that ostreecontainer ks command works on rhel9.
+# Test that ostreecontainer ks command works.
 # Tests only installation of the palyload.
 # Does not test that the installation is bootable.
 
diff --git a/rpm-ostree-container-rhel9.sh b/rpm-ostree-container.sh
similarity index 100%
rename from rpm-ostree-container-rhel9.sh
rename to rpm-ostree-container.sh