From 056a33041bb358640fa78781afe8cfc0540583d5 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Mon, 8 Aug 2022 15:14:19 +0200
Subject: [PATCH] manifests: use variables in ostree-commit

Instead of hard-coding the release and the snapshot, use variables,
which should help updating to newer releases and snapshots.
---
 .../manifests/fedora-ostree-commit.mpp.json   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/data/manifests/fedora-ostree-commit.mpp.json b/test/data/manifests/fedora-ostree-commit.mpp.json
index 9e54d64b..4cbb4967 100644
--- a/test/data/manifests/fedora-ostree-commit.mpp.json
+++ b/test/data/manifests/fedora-ostree-commit.mpp.json
@@ -1,4 +1,10 @@
 {
+  "mpp-vars": {
+    "arch": "x86_64",
+    "release": 34,
+    "releasever": "f$release",
+    "snapshot": "20210512"
+  },
   "version": "2",
   "pipelines": [
     {
@@ -6,7 +12,9 @@
         "path": "f34-build-v2.json",
         "id": "build"
       },
-      "runner": "org.osbuild.fedora34"
+      "runner": {
+        "mpp-format-string": "org.osbuild.fedora{release}"
+      }
     },
     {
       "name": "ostree-tree",
@@ -24,12 +32,13 @@
               "type": "org.osbuild.files",
               "origin": "org.osbuild.source",
               "mpp-depsolve": {
-                "architecture": "x86_64",
-                "module-platform-id": "f34",
+                "architecture": "$arch",
+                "module-platform-id": "$releasever",
+                "releasever": "$releasever",
                 "repos": [
                   {
                     "id": "default",
-                    "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/"
+                    "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/"
                   }
                 ],
                 "packages": [
@@ -104,7 +113,9 @@
           },
           "options": {
             "ref": "fedora/x86_64/osbuild",
-            "os_version": "34"
+            "os_version": {
+              "mpp-format-string": "{release}"
+            }
           }
         }
       ]