From e8bf211e0c9e320c783b8854dde45ffa9c9b0927 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 14 Jul 2021 18:36:14 +0000
Subject: [PATCH] test/data: move ostree repo to the iso root

Instead of having the OSTree repo in the anaconda root squashfs,
put the it to the root of the iso. This has several advantages:
first and foremost, we don't have to make a huge squahfs file-
system. We don't have to compress the repo. Additionally, the
repo is now easily accessible by mounting the iso.
---
 .../data/manifests/fedora-ostree-bootiso.json | 48 ++++++++---------
 .../manifests/fedora-ostree-bootiso.mpp.json  | 52 +++++++++----------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/test/data/manifests/fedora-ostree-bootiso.json b/test/data/manifests/fedora-ostree-bootiso.json
index 3922b57b..7c0ec85f 100644
--- a/test/data/manifests/fedora-ostree-bootiso.json
+++ b/test/data/manifests/fedora-ostree-bootiso.json
@@ -1657,29 +1657,6 @@
             ]
           }
         },
-        {
-          "type": "org.osbuild.ostree.init",
-          "options": {
-            "path": "/ostree/repo"
-          }
-        },
-        {
-          "type": "org.osbuild.ostree.pull",
-          "options": {
-            "repo": "/ostree/repo"
-          },
-          "inputs": {
-            "commits": {
-              "type": "org.osbuild.ostree",
-              "origin": "org.osbuild.pipeline",
-              "references": {
-                "name:ostree-commit": {
-                  "ref": "fedora/x86_64/osbuild"
-                }
-              }
-            }
-          }
-        },
         {
           "type": "org.osbuild.locale",
           "options": {
@@ -1727,13 +1704,36 @@
       "name": "bootiso-tree",
       "build": "name:build",
       "stages": [
+        {
+          "type": "org.osbuild.ostree.init",
+          "options": {
+            "path": "/ostree"
+          }
+        },
+        {
+          "type": "org.osbuild.ostree.pull",
+          "options": {
+            "repo": "/ostree"
+          },
+          "inputs": {
+            "commits": {
+              "type": "org.osbuild.ostree",
+              "origin": "org.osbuild.pipeline",
+              "references": {
+                "name:ostree-commit": {
+                  "ref": "fedora/x86_64/osbuild"
+                }
+              }
+            }
+          }
+        },
         {
           "type": "org.osbuild.kickstart",
           "options": {
             "path": "install.ks",
             "ostree": {
               "osname": "fedora",
-              "url": "file:///ostree/repo",
+              "url": "file:///run/install/repo/ostree",
               "ref": "fedora/x86_64/osbuild",
               "gpg": false
             },
diff --git a/test/data/manifests/fedora-ostree-bootiso.mpp.json b/test/data/manifests/fedora-ostree-bootiso.mpp.json
index c205d533..abbcaf49 100644
--- a/test/data/manifests/fedora-ostree-bootiso.mpp.json
+++ b/test/data/manifests/fedora-ostree-bootiso.mpp.json
@@ -426,31 +426,6 @@
             ]
           }
         },
-        {
-          "type": "org.osbuild.ostree.init",
-          "options": {
-            "path": "/ostree/repo"
-          }
-        },
-        {
-          "type": "org.osbuild.ostree.pull",
-          "options": {
-            "repo": "/ostree/repo"
-          },
-          "inputs": {
-            "commits": {
-              "type": "org.osbuild.ostree",
-              "origin": "org.osbuild.pipeline",
-              "references": {
-                "name:ostree-commit": {
-                  "ref": {
-                    "mpp-format-string": "{ref}"
-                  }
-                }
-              }
-            }
-          }
-        },
         {
           "type": "org.osbuild.locale",
           "options": {
@@ -500,13 +475,38 @@
       "name": "bootiso-tree",
       "build": "name:build",
       "stages": [
+        {
+          "type": "org.osbuild.ostree.init",
+          "options": {
+            "path": "/ostree"
+          }
+        },
+        {
+          "type": "org.osbuild.ostree.pull",
+          "options": {
+            "repo": "/ostree"
+          },
+          "inputs": {
+            "commits": {
+              "type": "org.osbuild.ostree",
+              "origin": "org.osbuild.pipeline",
+              "references": {
+                "name:ostree-commit": {
+                  "ref": {
+                    "mpp-format-string": "{ref}"
+                  }
+                }
+              }
+            }
+          }
+        },
         {
           "type": "org.osbuild.kickstart",
           "options": {
             "path": "install.ks",
             "ostree": {
               "osname": "fedora",
-              "url": "file:///ostree/repo",
+              "url": "file:///run/install/repo/ostree",
               "ref": {
                 "mpp-format-string": "{ref}"
               },