convert all mpp.yaml files to proper YAML

This is the second step of the conversion. All mpp.yaml json files were loaded and dumped again with pyyaml. It was tweaked to keep the order of keys and to save multi-line strings in the "flow" style. This was done, so the GPG keys are kept on one line. Otherwise, they take up too much visual space. There is no functional change in this commit.
2023-07-27 19:32:09 +02:00 · 2023-07-27 19:32:09 +02:00 · f777eb5ac2
commit f777eb5ac2
parent d827be2fb2
162 changed files with 7549 additions and 12376 deletions
--- a/test/data/manifests/fedora-boot.mpp.yaml
+++ b/test/data/manifests/fedora-boot.mpp.yaml
@ -1,113 +1,70 @@
-{
-  "mpp-vars": {
-    "arch": "x86_64",
-    "release": 34,
-    "releasever": "f$release",
-    "snapshot": "20210512"
-  },
-  "pipeline": {
-    "build": {
-      "mpp-import-pipeline": {
-        "path": "fedora-build.mpp.yaml"
-      },
-      "runner": {
-        "mpp-format-string": "org.osbuild.fedora{release}"
-      }
-    },
-    "stages": [
-      {
-        "name": "org.osbuild.kernel-cmdline",
-        "options": {
-          "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
-          "kernel_opts": "ro biosdevname=0 net.ifnames=0"
-        }
-      },
-      {
-        "name": "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-depsolve": {
-            "architecture": "$arch",
-            "module-platform-id": "$releasever",
-            "releasever": "$releasever",
-            "repos": [
-              {
-                "id": "default",
-                "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/"
-              }
-            ],
-            "packages": [
-              "@cloud-server-environment",
-              "chrony",
-              "dracut-config-generic",
-              "grub2-pc",
-              "kernel-core",
-              "langpacks-en",
-              "polkit",
-              "selinux-policy-targeted",
-              "systemd-udev"
-            ]
-          }
-        }
-      },
-      {
-        "name": "org.osbuild.locale",
-        "options": {
-          "language": "en_US.UTF-8"
-        }
-      },
-      {
-        "name": "org.osbuild.fstab",
-        "options": {
-          "filesystems": [
-            {
-              "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
-              "vfs_type": "ext4",
-              "path": "/",
-              "freq": 1,
-              "passno": 1
-            }
-          ]
-        }
-      },
-      {
-        "name": "org.osbuild.grub2",
-        "options": {
-          "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
-          "legacy": "i386-pc",
-          "saved_entry": {
-            "mpp-format-string": "{'f'*32}-{rpms['stages']['kernel-core'].evra}"
-          },
-          "write_cmdline": false
-        }
-      },
-      {
-        "name": "org.osbuild.test",
-        "options": {
-          "script": "/usr/bin/systemctl is-system-running --wait"
-        }
-      },
-      {
-        "name": "org.osbuild.selinux",
-        "options": {
-          "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
-        }
-      },
-      {
-        "name": "org.osbuild.fix-bls"
-      }
-    ],
-    "assembler": {
-      "name": "org.osbuild.qemu",
-      "options": {
-        "format": "qcow2",
-        "filename": "fedora-boot.qcow2",
-        "ptuuid": "0x1cd1d44b",
-        "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
-        "size": 3221225472
-      }
-    }
-  }
-}
+mpp-vars:
+  arch: x86_64
+  release: 34
+  releasever: f$release
+  snapshot: '20210512'
+pipeline:
+  build:
+    mpp-import-pipeline:
+      path: fedora-build.mpp.yaml
+    runner:
+      mpp-format-string: org.osbuild.fedora{release}
+  stages:
+    - name: org.osbuild.kernel-cmdline
+      options:
+        root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac
+        kernel_opts: ro biosdevname=0 net.ifnames=0
+    - name: 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-depsolve:
+          architecture: $arch
+          module-platform-id: $releasever
+          releasever: $releasever
+          repos:
+            - id: default
+              baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/
+          packages:
+            - '@cloud-server-environment'
+            - chrony
+            - dracut-config-generic
+            - grub2-pc
+            - kernel-core
+            - langpacks-en
+            - polkit
+            - selinux-policy-targeted
+            - systemd-udev
+    - name: org.osbuild.locale
+      options:
+        language: en_US.UTF-8
+    - name: org.osbuild.fstab
+      options:
+        filesystems:
+          - uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac
+            vfs_type: ext4
+            path: /
+            freq: 1
+            passno: 1
+    - name: org.osbuild.grub2
+      options:
+        root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac
+        legacy: i386-pc
+        saved_entry:
+          mpp-format-string: '{''f''*32}-{rpms[''stages''][''kernel-core''].evra}'
+        write_cmdline: false
+    - name: org.osbuild.test
+      options:
+        script: /usr/bin/systemctl is-system-running --wait
+    - name: org.osbuild.selinux
+      options:
+        file_contexts: etc/selinux/targeted/contexts/files/file_contexts
+    - name: org.osbuild.fix-bls
+  assembler:
+    name: org.osbuild.qemu
+    options:
+      format: qcow2
+      filename: fedora-boot.qcow2
+      ptuuid: '0x1cd1d44b'
+      root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac
+      size: 3221225472