From 39902a48b85de618f57a73e86b2a8d7b73845330 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Mon, 28 Oct 2024 09:42:10 -0400
Subject: [PATCH 01/19] add 41

---
 .github/workflows/build_vars.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index e574c150..38225552 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -10,7 +10,8 @@ on:
           {
             "version": [
               "39", 
-              "40", 
+              "40",
+              "41"
             ], 
             "flatpaks": [
               "false",
@@ -39,10 +40,9 @@ on:
                 "image_name": "fedora-bootc"
               },
               {
-                "version": "38",
+                "version": "41",
                 "image_repo": "quay.io/fedora",
-                "image_name": "fedora-bootc",
-                "image_src": "docker://quay.io/fedora-ostree-desktops/base:39"
+                "image_name": "fedora-bootc"
               }
             ]
           }'

From 3562fbdf3c899a7763fe12ec3b0e5027bacaa658 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Mon, 28 Oct 2024 10:56:41 -0500
Subject: [PATCH 02/19] add payload

---
 lorax_templates/flatpak_set_repo.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index 0d8db433..bf9c0eb7 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -1,8 +1,7 @@
 <%page args="flatpak_remote_name, _flatpak_repo_url, version"/>
 % if int(version) >= 41:
-append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
+append etc/anaconda/conf.d/anaconda.conf "[Payload]\nflatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 % endif
-

From 2fc4d41d6a34288a02258eb2acf7ec8d195de492 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Mon, 28 Oct 2024 12:33:26 -0500
Subject: [PATCH 03/19] add oci+

---
 lorax_templates/flatpak_set_repo.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index bf9c0eb7..b6f2fd7b 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -1,6 +1,6 @@
 <%page args="flatpak_remote_name, _flatpak_repo_url, version"/>
 % if int(version) >= 41:
-append etc/anaconda/conf.d/anaconda.conf "[Payload]\nflatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
+append etc/anaconda/conf.d/anaconda.conf "[Payload]\nflatpak_remote = ${flatpak_remote_name} oci+${_flatpak_repo_url}"
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py

From 92b626b44bbcd8341d6693c43cb8216b84c816aa Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Mon, 28 Oct 2024 13:17:41 -0500
Subject: [PATCH 04/19] set to 42 to test hardcoded option

---
 lorax_templates/flatpak_set_repo.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index b6f2fd7b..61c4c113 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -1,5 +1,5 @@
 <%page args="flatpak_remote_name, _flatpak_repo_url, version"/>
-% if int(version) >= 41:
+% if int(version) >= 42:
 append etc/anaconda/conf.d/anaconda.conf "[Payload]\nflatpak_remote = ${flatpak_remote_name} oci+${_flatpak_repo_url}"
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py

From a801d5f895e63b5e14beed1cf350fa9743194a0b Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:35:37 -0400
Subject: [PATCH 05/19] add on separate lines

---
 lorax_templates/flatpak_set_repo.tmpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index 61c4c113..b7fae2dc 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -1,6 +1,7 @@
 <%page args="flatpak_remote_name, _flatpak_repo_url, version"/>
-% if int(version) >= 42:
-append etc/anaconda/conf.d/anaconda.conf "[Payload]\nflatpak_remote = ${flatpak_remote_name} oci+${_flatpak_repo_url}"
+% if int(version) >= 41:
+append etc/anaconda/conf.d/anaconda.conf "[Payload]"
+append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py

From 4352624115f2e954e5a47c205baf39e2d19eb27b Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:28:33 -0400
Subject: [PATCH 06/19] remove trailing slash

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 20bc28de..843473f4 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ endif
 
 ifneq ($(FLATPAK_REMOTE_REFS),)
 _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
-export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
+export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2 | sed 's;/$;;')
 _LORAX_ARGS      += -i flatpak-libs
 _LORAX_TEMPLATES += $(call get_templates,flatpak) \
 					external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl

From 03fb87452891cb5e5048d0c552d06356ec9b901f Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 11:24:48 -0400
Subject: [PATCH 07/19] ensure flatpak is installed

---
 flatpaks/Makefile                     | 1 +
 lorax_templates/flatpak_set_repo.tmpl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/flatpaks/Makefile b/flatpaks/Makefile
index 3b6e939f..fc22df3b 100644
--- a/flatpaks/Makefile
+++ b/flatpaks/Makefile
@@ -14,6 +14,7 @@ repo: script.sh
 
 script.sh:
 	cat << EOF > script.sh
+	dnf install -y flatpak
 	mkdir -p /flatpak/flatpak /flatpak/triggers
 	mkdir /var/tmp || true
 	chmod -R 1777 /var/tmp
diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index b7fae2dc..00153494 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -2,6 +2,7 @@
 % if int(version) >= 41:
 append etc/anaconda/conf.d/anaconda.conf "[Payload]"
 append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
+#replace "fedora  oci+https://registry.fedoraproject.org" "${flatpak_remote_name} ${_flatpak_repo_url}" etc/anaconda/anaconda.conf
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py

From 697238fbdc7147c83766c9d5526ef933ba557568 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:25:41 -0400
Subject: [PATCH 08/19] cleanup

---
 .github/workflows/build_vars.yml      | 20 ++++++++++----------
 lorax_templates/flatpak_set_repo.tmpl |  1 -
 test/iso/flatpak_repo_updated.sh      |  5 +++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 38225552..ec5749d4 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -18,16 +18,16 @@ on:
               "flatpak_dir",
               "flatpak_refs"
             ],
-            "exclude": [
-              {
-                "version": "40",
-                "flatpaks": "flatpak_dir"
-              },
-              {
-                "version": "40",
-                "flatpaks": "flatpak_refs"
-              }
-            ],
+            #"exclude": [
+            #  {
+            #    "version": "40",
+            #    "flatpaks": "flatpak_dir"
+            #  },
+            #  {
+            #    "version": "40",
+            #    "flatpaks": "flatpak_refs"
+            #  }
+            #],
             "include": [
               {
                 "version": "39",
diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index 00153494..b7fae2dc 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -2,7 +2,6 @@
 % if int(version) >= 41:
 append etc/anaconda/conf.d/anaconda.conf "[Payload]"
 append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
-#replace "fedora  oci+https://registry.fedoraproject.org" "${flatpak_remote_name} ${_flatpak_repo_url}" etc/anaconda/anaconda.conf
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 83f37730..8d9ad1f1 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ ${VERSION} >= 41 ]]
+then
+    exit 0
+fi
+
 add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
 
 add_line_repo=$(echo "${add_line}" | grep "${FLATPAK_REMOTE_NAME}")

From 1e6f1b137e8630e1b4e9a5c0ca3f86b49f44336c Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:28:36 -0400
Subject: [PATCH 09/19] remove change

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 843473f4..20bc28de 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ endif
 
 ifneq ($(FLATPAK_REMOTE_REFS),)
 _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
-export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2 | sed 's;/$;;')
+export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
 _LORAX_ARGS      += -i flatpak-libs
 _LORAX_TEMPLATES += $(call get_templates,flatpak) \
 					external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl

From d0fe55a530b47bc4f42cd62d23fbc658b260a223 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:59:02 -0400
Subject: [PATCH 10/19] commenting is not allowed

---
 .github/workflows/build_vars.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index ec5749d4..6e90ba34 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -18,16 +18,6 @@ on:
               "flatpak_dir",
               "flatpak_refs"
             ],
-            #"exclude": [
-            #  {
-            #    "version": "40",
-            #    "flatpaks": "flatpak_dir"
-            #  },
-            #  {
-            #    "version": "40",
-            #    "flatpaks": "flatpak_refs"
-            #  }
-            #],
             "include": [
               {
                 "version": "39",

From 46ce1f343912e560c6049e1720bb2d462e223dae Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:07:35 -0400
Subject: [PATCH 11/19] fixes

---
 test/iso/flatpak_repo_updated.sh         | 2 +-
 test/vm/flatpak_fedora_repo_disabled.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 8d9ad1f1..27609e63 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ ${VERSION} >= 41 ]]
+if [[ ${VERSION} -ge 41 ]]
 then
     exit 0
 fi
diff --git a/test/vm/flatpak_fedora_repo_disabled.yml b/test/vm/flatpak_fedora_repo_disabled.yml
index 17a3e08d..dfb6c7dd 100644
--- a/test/vm/flatpak_fedora_repo_disabled.yml
+++ b/test/vm/flatpak_fedora_repo_disabled.yml
@@ -10,6 +10,7 @@
     register: services_state
 
   - name: Check that flatpak-add-fedora-repos is disabled
+    when: services_state['ansible_facts']['services']['flatpak-add-fedora-repos.service'] is defined
     ansible.builtin.assert:
       that:
         - services_state['ansible_facts']['services']['flatpak-add-fedora-repos.service']['status'] == 'disabled'

From f5d8ad4852861fefe8fca7c4b358fd6a1e20ab9c Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:14:17 -0400
Subject: [PATCH 12/19] fix refs_dir testing

---
 .github/workflows/build_vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 6e90ba34..17fa4c14 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -15,7 +15,7 @@ on:
             ], 
             "flatpaks": [
               "false",
-              "flatpak_dir",
+              "flatpak_refs_dir",
               "flatpak_refs"
             ],
             "include": [

From c00a850765bb454b33aa868e88366097aa0218b9 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:16:24 -0400
Subject: [PATCH 13/19] run test on 41

---
 test/iso/flatpak_repo_updated.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 27609e63..68a07c49 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -2,7 +2,8 @@
 
 if [[ ${VERSION} -ge 41 ]]
 then
-    exit 0
+    grep "${_FLATPAK_REPO_URL}" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null
+    exit $?
 fi
 
 add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)

From af27ec80188eee4f0d9a9ac26a4c26eef2573081 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:14:41 -0400
Subject: [PATCH 14/19] only install if not found

---
 flatpaks/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flatpaks/Makefile b/flatpaks/Makefile
index fc22df3b..7729d01d 100644
--- a/flatpaks/Makefile
+++ b/flatpaks/Makefile
@@ -14,7 +14,7 @@ repo: script.sh
 
 script.sh:
 	cat << EOF > script.sh
-	dnf install -y flatpak
+	which flatpak &> /dev/null || dnf install -y flatpak
 	mkdir -p /flatpak/flatpak /flatpak/triggers
 	mkdir /var/tmp || true
 	chmod -R 1777 /var/tmp

From 16b7aacb50687123db612d7c32df605f809fd87a Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:34:12 -0400
Subject: [PATCH 15/19] small fixes

---
 .github/workflows/build_vars.yml         |  2 +-
 test/iso/flatpak_repo_updated.sh         | 12 ++++++++++--
 test/vm/flatpak_fedora_repo_disabled.yml |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 17fa4c14..e5b3ad3a 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -12,7 +12,7 @@ on:
               "39", 
               "40",
               "41"
-            ], 
+            ],
             "flatpaks": [
               "false",
               "flatpak_refs_dir",
diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 68a07c49..46f33d16 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -2,8 +2,16 @@
 
 if [[ ${VERSION} -ge 41 ]]
 then
-    grep "${_FLATPAK_REPO_URL}" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null
-    exit $?
+    result=0
+    grep "^[Payload]" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null || {
+        echo "Missing [Payload] header"
+        result=1
+    }
+    grep "^flatpak_remote = ${FLATPAK_REMOTE_NAME} ${_FLATPAK_REPO_URL}" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null || {
+        echo "Missing flatpak_remote option"
+        result=1
+    }
+    exit ${result}
 fi
 
 add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
diff --git a/test/vm/flatpak_fedora_repo_disabled.yml b/test/vm/flatpak_fedora_repo_disabled.yml
index dfb6c7dd..aacfc093 100644
--- a/test/vm/flatpak_fedora_repo_disabled.yml
+++ b/test/vm/flatpak_fedora_repo_disabled.yml
@@ -14,4 +14,5 @@
     ansible.builtin.assert:
       that:
         - services_state['ansible_facts']['services']['flatpak-add-fedora-repos.service']['status'] == 'disabled'
-      fail_msg: 'flatpak-add-fedora-repos.service is not disabled'
\ No newline at end of file
+      fail_msg: 'flatpak-add-fedora-repos.service is not disabled'
+      success_msg: 'flatpak-add-fedora-repos.service is correctly disabled'
\ No newline at end of file

From 220fb521d288bdb1a88319dd9563c2a32f32578e Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:49:35 -0400
Subject: [PATCH 16/19] use an image with flatpak installed

---
 .github/workflows/build_vars.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index e5b3ad3a..3052b015 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -31,8 +31,8 @@ on:
               },
               {
                 "version": "41",
-                "image_repo": "quay.io/fedora",
-                "image_name": "fedora-bootc"
+                "image_repo": "ghcr.io/ublue-os",
+                "image_name": "base-main"
               }
             ]
           }'

From f597d3405245d2783c221f729d194e3fc107635f Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 30 Oct 2024 08:00:56 -0400
Subject: [PATCH 17/19] escape characters

---
 test/iso/flatpak_repo_updated.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 46f33d16..c8187ff1 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -3,7 +3,7 @@
 if [[ ${VERSION} -ge 41 ]]
 then
     result=0
-    grep "^[Payload]" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null || {
+    grep "^\[Payload\]" mnt/install/etc/anaconda/conf.d/anaconda.conf > /dev/null || {
         echo "Missing [Payload] header"
         result=1
     }

From 5043db1b07eba36d02b7e7e3441430f43784e1e4 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:37:26 -0400
Subject: [PATCH 18/19] use ublue main for all tests

---
 .github/workflows/build_vars.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 3052b015..ffbe6149 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -18,22 +18,11 @@ on:
               "flatpak_refs_dir",
               "flatpak_refs"
             ],
-            "include": [
-              {
-                "version": "39",
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "image_name": "base"
-              },
-              {
-                "version": "40",
-                "image_repo": "quay.io/fedora",
-                "image_name": "fedora-bootc"
-              },
-              {
-                "version": "41",
-                "image_repo": "ghcr.io/ublue-os",
-                "image_name": "base-main"
-              }
+            "image_repo": [
+              "ghcr.io/ublue-os"
+            ],
+            "image_name": [
+              "base-main"
             ]
           }'
       VARIANT:

From 53c5aa94cafbea5725002215c76d8413254bd95d Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:59:23 -0400
Subject: [PATCH 19/19] add newline at end of file

---
 test/vm/flatpak_fedora_repo_disabled.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vm/flatpak_fedora_repo_disabled.yml b/test/vm/flatpak_fedora_repo_disabled.yml
index aacfc093..eb870995 100644
--- a/test/vm/flatpak_fedora_repo_disabled.yml
+++ b/test/vm/flatpak_fedora_repo_disabled.yml
@@ -15,4 +15,4 @@
       that:
         - services_state['ansible_facts']['services']['flatpak-add-fedora-repos.service']['status'] == 'disabled'
       fail_msg: 'flatpak-add-fedora-repos.service is not disabled'
-      success_msg: 'flatpak-add-fedora-repos.service is correctly disabled'
\ No newline at end of file
+      success_msg: 'flatpak-add-fedora-repos.service is correctly disabled'