manifests/fedora-ostree-bootiso*: update to the new structure

This commit changes this manifest to use the new fedora-vars.ipp and
fedora-build-v2.ipp infrastructure to remove all hardcoded Fedora versions.

An auto-generated ostree ref and isolabel was added to fedora-vars.

smc-meera-fonts was retired, so this commit changes it to rit-meera-new-fonts.
See
a8fe0d2620

icfg and reiserfs-utils are gone too, and they don't seem to be neccessary for
the image, so they were removed as well. Please correct me, if I am wrong.

test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml

@@ -1,33 +1,28 @@
 version: '2'
-mpp-vars:
-  arch: x86_64
-  version: 34
-  relver: f$version
-  snapshot: '20210512'
-  ref: fedora/$arch/osbuild
-  isolabel: Fedora-$version-X86_64
 pipelines:
+  - mpp-import-pipelines:
+      path: fedora-vars.ipp.yaml
   - mpp-import-pipeline:
-      path: f34-build-v2.json
+      path: fedora-build-v2.ipp.yaml
       id: build
-    runner: org.osbuild.fedora34
+    runner:
+      mpp-format-string: org.osbuild.fedora{release}
   - name: ostree-tree
     build: name:build
     stages:
       - type: org.osbuild.rpm
         options:
           gpgkeys:
-            - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
+            mpp-eval: gpgkeys
         inputs:
           packages:
             type: org.osbuild.files
             origin: org.osbuild.source
             mpp-depsolve:
               architecture: $arch
-              module-platform-id: $relver
+              module-platform-id: $module_platform_id
               repos:
-                - id: default
-                  baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/
+                mpp-eval: repos
               packages:
                 - fedora-release-iot
                 - glibc
@@ -168,7 +163,7 @@ pipelines:
           ref:
             mpp-format-string: '{ref}'
           os_version:
-            mpp-format-string: '{version}'
+            mpp-format-string: '{release}'
   - name: anaconda-tree
     build: name:build
     stages:
@@ -179,10 +174,9 @@ pipelines:
             origin: org.osbuild.source
             mpp-depsolve:
               architecture: $arch
-              module-platform-id: $relver
+              module-platform-id: $module_platform_id
               repos:
-                - id: default
-                  baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/
+                mpp-eval: repos
               packages:
                 - anaconda
                 - anaconda-widgets
@@ -240,7 +234,6 @@ pipelines:
                 - btrfs-progs
                 - jfsutils
                 - xfsprogs
-                - reiserfs-utils
                 - gfs2-utils
                 - ntfs-3g
                 - ntfsprogs
@@ -299,7 +292,7 @@ pipelines:
                 - sil-abyssinica-fonts
                 - sil-padauk-fonts
                 - sil-scheherazade-fonts
-                - smc-meera-fonts
+                - rit-meera-new-fonts
                 - thai-scalable-waree-fonts
                 - xorg-x11-fonts-misc
                 - gdb-gdbserver
@@ -319,7 +312,6 @@ pipelines:
                 - ftp
                 - mtr
                 - vconfig
-                - icfg
                 - spice-vdagent
                 - gdisk
                 - hexedit
@@ -327,7 +319,7 @@ pipelines:
                 - notification-daemon
         options:
           gpgkeys:
-            - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
+            mpp-eval: gpgkeys
           exclude:
             docs: true
           disable_dracut: true
@@ -337,7 +329,7 @@ pipelines:
             mpp-format-string: '{arch}'
           product: Fedora-IoT
           version:
-            mpp-format-string: '{version}'
+            mpp-format-string: '{release}'
           variant: osbuild
           final: true
           bugurl: https://github.com/gicmo/ostree-osbuild-demo/issues
@@ -430,7 +422,7 @@ pipelines:
           product:
             name: Fedora-IoT
             version:
-              mpp-format-string: '{version}'
+              mpp-format-string: '{release}'
           isolabel:
             mpp-format-string: '{isolabel}'
           kernel:
@@ -488,7 +480,7 @@ pipelines:
           product:
             name: Fedora-IoT
             version:
-              mpp-format-string: '{version}'
+              mpp-format-string: '{release}'
           kernel:
             dir: /images/pxeboot
             opts:

test/data/manifests/fedora-ostree-bootiso.mpp.yaml

@@ -1,33 +1,28 @@
 version: '2'
-mpp-vars:
-  arch: x86_64
-  version: 34
-  relver: f$version
-  snapshot: '20210512'
-  ref: fedora/$arch/osbuild
-  isolabel: Fedora-$version-X86_64
 pipelines:
+  - mpp-import-pipelines:
+      path: fedora-vars.ipp.yaml
   - mpp-import-pipeline:
-      path: f34-build-v2.json
+      path: fedora-build-v2.ipp.yaml
       id: build
-    runner: org.osbuild.fedora34
+    runner:
+      mpp-format-string: org.osbuild.fedora{release}
   - name: ostree-tree
     build: name:build
     stages:
       - type: org.osbuild.rpm
         options:
           gpgkeys:
-            - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
+            mpp-eval: gpgkeys
         inputs:
           packages:
             type: org.osbuild.files
             origin: org.osbuild.source
             mpp-depsolve:
               architecture: $arch
-              module-platform-id: $relver
+              module-platform-id: $module_platform_id
               repos:
-                - id: default
-                  baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/
+                mpp-eval: repos
               packages:
                 - fedora-release-iot
                 - glibc
@@ -168,7 +163,7 @@ pipelines:
           ref:
             mpp-format-string: '{ref}'
           os_version:
-            mpp-format-string: '{version}'
+            mpp-format-string: '{release}'
   - name: anaconda-tree
     build: name:build
     stages:
@@ -179,10 +174,9 @@ pipelines:
             origin: org.osbuild.source
             mpp-depsolve:
               architecture: $arch
-              module-platform-id: $relver
+              module-platform-id: $module_platform_id
               repos:
-                - id: default
-                  baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/
+                mpp-eval: repos
               packages:
                 - anaconda
                 - anaconda-widgets
@@ -240,7 +234,6 @@ pipelines:
                 - btrfs-progs
                 - jfsutils
                 - xfsprogs
-                - reiserfs-utils
                 - gfs2-utils
                 - ntfs-3g
                 - ntfsprogs
@@ -299,7 +292,7 @@ pipelines:
                 - sil-abyssinica-fonts
                 - sil-padauk-fonts
                 - sil-scheherazade-fonts
-                - smc-meera-fonts
+                - rit-meera-new-fonts
                 - thai-scalable-waree-fonts
                 - xorg-x11-fonts-misc
                 - gdb-gdbserver
@@ -319,7 +312,6 @@ pipelines:
                 - ftp
                 - mtr
                 - vconfig
-                - icfg
                 - spice-vdagent
                 - gdisk
                 - hexedit
@@ -327,7 +319,7 @@ pipelines:
                 - notification-daemon
         options:
           gpgkeys:
-            - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
+            mpp-eval: gpgkeys
           exclude:
             docs: true
           disable_dracut: true
@@ -337,7 +329,7 @@ pipelines:
             mpp-format-string: '{arch}'
           product: Fedora-IoT
           version:
-            mpp-format-string: '{version}'
+            mpp-format-string: '{release}'
           variant: osbuild
           final: true
           bugurl: https://github.com/gicmo/ostree-osbuild-demo/issues
@@ -430,7 +422,7 @@ pipelines:
           product:
             name: Fedora-IoT
             version:
-              mpp-format-string: '{version}'
+              mpp-format-string: '{release}'
           isolabel:
             mpp-format-string: '{isolabel}'
           kernel:
@@ -486,7 +478,7 @@ pipelines:
           product:
             name: Fedora-IoT
             version:
-              mpp-format-string: '{version}'
+              mpp-format-string: '{release}'
           kernel:
             dir: /images/pxeboot
             opts:

test/data/manifests/fedora-vars.ipp.yaml

@@ -7,6 +7,8 @@ mpp-vars:
   module_platform_id: platform:$releasever
   snapshot: '20230413'
   updates: '20230724'
+  ref: fedora/$arch/osbuild
+  isolabel: Fedora-$release-X86_64
   repos:
     - id: default
       baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/