From d827be2fb261c023e39aba62567aabb9911c80a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Thu, 27 Jul 2023 17:00:58 +0200
Subject: [PATCH] rename all .mpp.json files to .mpp.yaml

osbuild-mpp supports yaml files. The advantage of yaml is that it's less
verbose and allows comments. This way, we can start documenting all the
test manifests in this repository.

This is the first step: This commit just renames the files, so we keep the
history intact. Remember: YAML is a super-set(*) of JSON, so this is fine.

There is no functional change in this commit.

(*) There are some caveats, but we don't need to care in this case.
---
 Makefile                                               | 10 +++++-----
 test/data/README.md                                    |  4 ++--
 .../arch/{arch-build.mpp.json => arch-build.mpp.yaml}  |  0
 ...-libvirt.mpp.json => arch-vagrant-libvirt.mpp.yaml} |  0
 ...eam-build.mpp.json => centos-stream-build.mpp.yaml} |  0
 ...-stream-uki.mpp.json => centos-stream-uki.mpp.yaml} |  2 +-
 .../manifests/{f34-base.mpp.json => f34-base.mpp.yaml} |  0
 .../{f34-build-v2.mpp.json => f34-build-v2.mpp.yaml}   |  0
 .../{f34-build.mpp.json => f34-build.mpp.yaml}         |  0
 .../{fedora-boot.mpp.json => fedora-boot.mpp.yaml}     |  2 +-
 ...dora-build-v2.mpp.json => fedora-build-v2.mpp.yaml} |  0
 .../{fedora-build.mpp.json => fedora-build.mpp.yaml}   |  0
 ...ra-container.mpp.json => fedora-container.mpp.yaml} |  0
 ...o-xz.mpp.json => fedora-ostree-bootiso-xz.mpp.yaml} |  0
 ...bootiso.mpp.json => fedora-ostree-bootiso.mpp.yaml} |  0
 ...e-commit.mpp.json => fedora-ostree-commit.mpp.yaml} |  2 +-
 ...ainer.mpp.json => fedora-ostree-container.mpp.yaml} |  0
 ...ree-image.mpp.json => fedora-ostree-image.mpp.yaml} |  4 ++--
 ...pp.json => fedora-ostree-native-container.mpp.yaml} |  4 ++--
 ...tarball.mpp.json => fedora-ostree-tarball.mpp.yaml} |  0
 .../{fedora-uki.mpp.json => fedora-uki.mpp.yaml}       |  2 +-
 .../{filesystem.mpp.json => filesystem.mpp.yaml}       |  0
 .../rhel/{el7-build.mpp.json => el7-build.mpp.yaml}    |  0
 .../rhel/{el7-qcow2.mpp.json => el7-qcow2.mpp.yaml}    |  0
 test/data/stages/authconfig/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/authconfig/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/authselect/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/authselect/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/chmod/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/chmod/{b.mpp.json => b.mpp.yaml}      |  0
 test/data/stages/chown/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/chown/{b.mpp.json => b.mpp.yaml}      |  0
 .../stages/chrony-servers/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/chrony-servers/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/chrony/{a.mpp.json => a.mpp.yaml}     |  0
 test/data/stages/chrony/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/cloud-init/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/cloud-init/{b.mpp.json => b.mpp.yaml} |  0
 .../containers.storage.conf/{a.mpp.json => a.mpp.yaml} |  0
 .../containers.storage.conf/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/copy/{a.mpp.json => a.mpp.yaml}       |  0
 test/data/stages/copy/{b.mpp.json => b.mpp.yaml}       |  0
 test/data/stages/cpio.out/{a.mpp.json => a.mpp.yaml}   |  0
 test/data/stages/cpio.out/{b.mpp.json => b.mpp.yaml}   |  0
 .../data/stages/cron.script/{a.mpp.json => a.mpp.yaml} |  0
 .../data/stages/cron.script/{b.mpp.json => b.mpp.yaml} |  0
 .../dnf-automatic.config/{a.mpp.json => a.mpp.yaml}    |  0
 .../dnf-automatic.config/{b.mpp.json => b.mpp.yaml}    |  0
 test/data/stages/dnf.config/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/dnf.config/{b.mpp.json => b.mpp.yaml} |  0
 .../data/stages/dracut.conf/{a.mpp.json => a.mpp.yaml} |  0
 .../data/stages/dracut.conf/{b.mpp.json => b.mpp.yaml} |  0
 .../dracut/{template.mpp.json => template.mpp.yaml}    |  0
 test/data/stages/fdo/{a.mpp.json => a.mpp.yaml}        |  0
 test/data/stages/fdo/{b.mpp.json => b.mpp.yaml}        |  0
 test/data/stages/firewall/{a.mpp.json => a.mpp.yaml}   |  0
 test/data/stages/firewall/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/fstab/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/fstab/{b.mpp.json => b.mpp.yaml}      |  0
 .../gcp.guest-agent.conf/{a.mpp.json => a.mpp.yaml}    |  0
 .../gcp.guest-agent.conf/{b.mpp.json => b.mpp.yaml}    |  0
 test/data/stages/groups/{a.mpp.json => a.mpp.yaml}     |  0
 test/data/stages/groups/{b.mpp.json => b.mpp.yaml}     |  0
 .../stages/grub2.legacy/{a.mpp.json => a.mpp.yaml}     |  0
 .../stages/grub2.legacy/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/grub2/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/grub2/{b.mpp.json => b.mpp.yaml}      |  0
 test/data/stages/gunzip/{a.mpp.json => a.mpp.yaml}     |  0
 test/data/stages/gunzip/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/gzip/{a.mpp.json => a.mpp.yaml}       |  0
 test/data/stages/gzip/{b.mpp.json => b.mpp.yaml}       |  0
 test/data/stages/hostname/{a.mpp.json => a.mpp.yaml}   |  0
 test/data/stages/hostname/{b.mpp.json => b.mpp.yaml}   |  0
 .../stages/kernel-cmdline/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/kernel-cmdline/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/keymap/{a.mpp.json => a.mpp.yaml}     |  0
 test/data/stages/keymap/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/livesys/{a.mpp.json => a.mpp.yaml}    |  0
 test/data/stages/livesys/{b.mpp.json => b.mpp.yaml}    |  0
 test/data/stages/locale/{a.mpp.json => a.mpp.yaml}     |  0
 test/data/stages/locale/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/mkdir/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/mkdir/{b.mpp.json => b.mpp.yaml}      |  0
 test/data/stages/modprobe/{a.mpp.json => a.mpp.yaml}   |  0
 test/data/stages/modprobe/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/nginx.conf/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/nginx.conf/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/nm.conf/{a.mpp.json => a.mpp.yaml}    |  0
 test/data/stages/nm.conf/{b.mpp.json => b.mpp.yaml}    |  0
 test/data/stages/nm.conn/{a.mpp.json => a.mpp.yaml}    |  0
 test/data/stages/nm.conn/{b.mpp.json => b.mpp.yaml}    |  0
 .../stages/oscap.autotailor/{a.mpp.json => a.mpp.yaml} |  0
 .../stages/oscap.autotailor/{b.mpp.json => b.mpp.yaml} |  0
 .../oscap.remediation/{a.mpp.json => a.mpp.yaml}       |  0
 .../oscap.remediation/{b.mpp.json => b.mpp.yaml}       |  0
 test/data/stages/ovf/{ovf.mpp.json => ovf.mpp.yaml}    |  0
 .../stages/pam.limits.conf/{a.mpp.json => a.mpp.yaml}  |  0
 .../stages/pam.limits.conf/{b.mpp.json => b.mpp.yaml}  |  0
 .../stages/parted/{parted.mpp.json => parted.mpp.yaml} |  0
 .../stages/pwquality.conf/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/pwquality.conf/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/qemu/{qemu.mpp.json => qemu.mpp.yaml} |  0
 .../data/stages/resolv-conf/{a.mpp.json => a.mpp.yaml} |  0
 .../data/stages/resolv-conf/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/rhsm.facts/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/rhsm.facts/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/rhsm/{a.mpp.json => a.mpp.yaml}       |  0
 test/data/stages/rhsm/{b.mpp.json => b.mpp.yaml}       |  0
 test/data/stages/rpm.macros/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/rpm.macros/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/rpm/{b.mpp.json => b.mpp.yaml}        |  0
 .../stages/rpmkeys.import/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/rpmkeys.import/{b.mpp.json => b.mpp.yaml}   |  0
 .../stages/selinux.config/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/selinux.config/{b.mpp.json => b.mpp.yaml}   |  0
 .../stages/sfdisk/{sfdisk.mpp.json => sfdisk.mpp.yaml} |  0
 .../stages/sgdisk/{sgdisk.mpp.json => sgdisk.mpp.yaml} |  0
 test/data/stages/shell.init/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/shell.init/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/skopeo/{a.mpp.json => a.mpp.yaml}     |  0
 test/data/stages/skopeo/{b.mpp.json => b.mpp.yaml}     |  0
 .../data/stages/sshd.config/{a.mpp.json => a.mpp.yaml} |  0
 .../data/stages/sshd.config/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/sysconfig/{a.mpp.json => a.mpp.yaml}  |  0
 test/data/stages/sysconfig/{b.mpp.json => b.mpp.yaml}  |  0
 test/data/stages/sysctld/{a.mpp.json => a.mpp.yaml}    |  0
 test/data/stages/sysctld/{b.mpp.json => b.mpp.yaml}    |  0
 .../stages/systemd-journald/{a.mpp.json => a.mpp.yaml} |  0
 .../stages/systemd-journald/{b.mpp.json => b.mpp.yaml} |  0
 .../stages/systemd-logind/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/systemd-logind/{b.mpp.json => b.mpp.yaml}   |  0
 .../stages/systemd.preset/{a.mpp.json => a.mpp.yaml}   |  0
 .../stages/systemd.preset/{b.mpp.json => b.mpp.yaml}   |  0
 .../stages/systemd.unit/{a.mpp.json => a.mpp.yaml}     |  0
 .../stages/systemd.unit/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/systemd/{a.mpp.json => a.mpp.yaml}    |  0
 test/data/stages/systemd/{b.mpp.json => b.mpp.yaml}    |  0
 test/data/stages/tar/{tar.mpp.json => tar.mpp.yaml}    |  0
 test/data/stages/timezone/{a.mpp.json => a.mpp.yaml}   |  0
 test/data/stages/timezone/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/tmpfilesd/{a.mpp.json => a.mpp.yaml}  |  0
 test/data/stages/tmpfilesd/{b.mpp.json => b.mpp.yaml}  |  0
 test/data/stages/tuned/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/tuned/{b.mpp.json => b.mpp.yaml}      |  0
 test/data/stages/udev.rules/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/udev.rules/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/untar/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/untar/{b.mpp.json => b.mpp.yaml}      |  0
 test/data/stages/users/{a.mpp.json => a.mpp.yaml}      |  0
 test/data/stages/users/{b.mpp.json => b.mpp.yaml}      |  0
 .../stages/waagent.conf/{a.mpp.json => a.mpp.yaml}     |  0
 .../stages/waagent.conf/{b.mpp.json => b.mpp.yaml}     |  0
 test/data/stages/wsl.conf/{a.mpp.json => a.mpp.yaml}   |  0
 test/data/stages/wsl.conf/{b.mpp.json => b.mpp.yaml}   |  0
 test/data/stages/xz/{a.mpp.json => a.mpp.yaml}         |  0
 test/data/stages/xz/{b.mpp.json => b.mpp.yaml}         |  0
 test/data/stages/yum.config/{a.mpp.json => a.mpp.yaml} |  0
 test/data/stages/yum.config/{b.mpp.json => b.mpp.yaml} |  0
 test/data/stages/yum.repos/{a.mpp.json => a.mpp.yaml}  |  0
 test/data/stages/yum.repos/{b.mpp.json => b.mpp.yaml}  |  0
 test/data/stages/zipl/{a.mpp.json => a.mpp.yaml}       |  0
 test/data/stages/zipl/{b.mpp.json => b.mpp.yaml}       |  0
 test/data/stages/zstd/{a.mpp.json => a.mpp.yaml}       |  0
 test/data/stages/zstd/{b.mpp.json => b.mpp.yaml}       |  0
 164 files changed, 15 insertions(+), 15 deletions(-)
 rename test/data/manifests/arch/{arch-build.mpp.json => arch-build.mpp.yaml} (100%)
 rename test/data/manifests/arch/{arch-vagrant-libvirt.mpp.json => arch-vagrant-libvirt.mpp.yaml} (100%)
 rename test/data/manifests/{centos-stream-build.mpp.json => centos-stream-build.mpp.yaml} (100%)
 rename test/data/manifests/{centos-stream-uki.mpp.json => centos-stream-uki.mpp.yaml} (99%)
 rename test/data/manifests/{f34-base.mpp.json => f34-base.mpp.yaml} (100%)
 rename test/data/manifests/{f34-build-v2.mpp.json => f34-build-v2.mpp.yaml} (100%)
 rename test/data/manifests/{f34-build.mpp.json => f34-build.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-boot.mpp.json => fedora-boot.mpp.yaml} (99%)
 rename test/data/manifests/{fedora-build-v2.mpp.json => fedora-build-v2.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-build.mpp.json => fedora-build.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-container.mpp.json => fedora-container.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-ostree-bootiso-xz.mpp.json => fedora-ostree-bootiso-xz.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-ostree-bootiso.mpp.json => fedora-ostree-bootiso.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-ostree-commit.mpp.json => fedora-ostree-commit.mpp.yaml} (99%)
 rename test/data/manifests/{fedora-ostree-container.mpp.json => fedora-ostree-container.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-ostree-image.mpp.json => fedora-ostree-image.mpp.yaml} (99%)
 rename test/data/manifests/{fedora-ostree-native-container.mpp.json => fedora-ostree-native-container.mpp.yaml} (91%)
 rename test/data/manifests/{fedora-ostree-tarball.mpp.json => fedora-ostree-tarball.mpp.yaml} (100%)
 rename test/data/manifests/{fedora-uki.mpp.json => fedora-uki.mpp.yaml} (99%)
 rename test/data/manifests/{filesystem.mpp.json => filesystem.mpp.yaml} (100%)
 rename test/data/manifests/rhel/{el7-build.mpp.json => el7-build.mpp.yaml} (100%)
 rename test/data/manifests/rhel/{el7-qcow2.mpp.json => el7-qcow2.mpp.yaml} (100%)
 rename test/data/stages/authconfig/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/authconfig/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/authselect/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/authselect/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/chmod/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/chmod/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/chown/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/chown/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/chrony-servers/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/chrony-servers/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/chrony/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/chrony/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/cloud-init/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/cloud-init/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/containers.storage.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/containers.storage.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/copy/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/copy/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/cpio.out/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/cpio.out/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/cron.script/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/cron.script/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/dnf-automatic.config/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/dnf-automatic.config/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/dnf.config/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/dnf.config/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/dracut.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/dracut.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/dracut/{template.mpp.json => template.mpp.yaml} (100%)
 rename test/data/stages/fdo/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/fdo/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/firewall/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/firewall/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/fstab/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/fstab/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/gcp.guest-agent.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/gcp.guest-agent.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/groups/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/groups/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/grub2.legacy/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/grub2.legacy/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/grub2/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/grub2/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/gunzip/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/gunzip/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/gzip/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/gzip/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/hostname/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/hostname/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/kernel-cmdline/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/kernel-cmdline/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/keymap/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/keymap/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/livesys/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/livesys/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/locale/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/locale/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/mkdir/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/mkdir/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/modprobe/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/modprobe/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/nginx.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/nginx.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/nm.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/nm.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/nm.conn/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/nm.conn/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/oscap.autotailor/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/oscap.autotailor/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/oscap.remediation/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/oscap.remediation/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/ovf/{ovf.mpp.json => ovf.mpp.yaml} (100%)
 rename test/data/stages/pam.limits.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/pam.limits.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/parted/{parted.mpp.json => parted.mpp.yaml} (100%)
 rename test/data/stages/pwquality.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/pwquality.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/qemu/{qemu.mpp.json => qemu.mpp.yaml} (100%)
 rename test/data/stages/resolv-conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/resolv-conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/rhsm.facts/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/rhsm.facts/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/rhsm/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/rhsm/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/rpm.macros/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/rpm.macros/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/rpm/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/rpmkeys.import/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/rpmkeys.import/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/selinux.config/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/selinux.config/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/sfdisk/{sfdisk.mpp.json => sfdisk.mpp.yaml} (100%)
 rename test/data/stages/sgdisk/{sgdisk.mpp.json => sgdisk.mpp.yaml} (100%)
 rename test/data/stages/shell.init/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/shell.init/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/skopeo/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/skopeo/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/sshd.config/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/sshd.config/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/sysconfig/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/sysconfig/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/sysctld/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/sysctld/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/systemd-journald/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/systemd-journald/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/systemd-logind/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/systemd-logind/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/systemd.preset/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/systemd.preset/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/systemd.unit/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/systemd.unit/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/systemd/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/systemd/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/tar/{tar.mpp.json => tar.mpp.yaml} (100%)
 rename test/data/stages/timezone/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/timezone/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/tmpfilesd/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/tmpfilesd/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/tuned/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/tuned/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/udev.rules/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/udev.rules/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/untar/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/untar/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/users/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/users/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/waagent.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/waagent.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/wsl.conf/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/wsl.conf/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/xz/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/xz/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/yum.config/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/yum.config/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/yum.repos/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/yum.repos/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/zipl/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/zipl/{b.mpp.json => b.mpp.yaml} (100%)
 rename test/data/stages/zstd/{a.mpp.json => a.mpp.yaml} (100%)
 rename test/data/stages/zstd/{b.mpp.json => b.mpp.yaml} (100%)

diff --git a/Makefile b/Makefile
index 3c9aa448..9d859389 100644
--- a/Makefile
+++ b/Makefile
@@ -203,13 +203,13 @@ coverity-clean-all: coverity-clean
 # for linters and other tests on the source code.
 #
 
-TEST_MANIFESTS_MPP = $(filter-out $(SRCDIR)/test/data/manifests/fedora-build.mpp.json, \
-             $(wildcard $(SRCDIR)/test/data/manifests/*.mpp.json)) \
-		     $(wildcard $(SRCDIR)/test/data/stages/*/*.mpp.json)
-TEST_MANIFESTS_GEN = $(TEST_MANIFESTS_MPP:%.mpp.json=%.json)
+TEST_MANIFESTS_MPP = $(filter-out $(SRCDIR)/test/data/manifests/fedora-build.mpp.yaml, \
+             $(wildcard $(SRCDIR)/test/data/manifests/*.mpp.yaml)) \
+		     $(wildcard $(SRCDIR)/test/data/stages/*/*.mpp.yaml)
+TEST_MANIFESTS_GEN = $(TEST_MANIFESTS_MPP:%.mpp.yaml=%.json)
 
 .PHONY: $(TEST_MANIFESTS_GEN)
-$(TEST_MANIFESTS_GEN): %.json: %.mpp.json
+$(TEST_MANIFESTS_GEN): %.json: %.mpp.yaml
 	$(SRCDIR)/tools/osbuild-mpp -I "$(SRCDIR)/test/data/manifests" "$<" "$@"
 
 $(SRCDIR)/test/data/manifests/f34-base.json: $(SRCDIR)/test/data/manifests/f34-build.json
diff --git a/test/data/README.md b/test/data/README.md
index c88d7ddc..3c312eb9 100644
--- a/test/data/README.md
+++ b/test/data/README.md
@@ -32,9 +32,9 @@ do not allow comments, this file shortly describes their purpose.
    this manifest's tree is constructed just from the filesystem package and is
    marked using the selinux stage.
 
-   Manifests ending on `.mpp.json` are fed through the ManifestPreProcessors
+   Manifests ending on `.mpp.yaml` are fed through the ManifestPreProcessors
    and then stored in the same directory with an `.json` extension (replacing
-   `.mpp.json`). generated files are committed to the repository. Nevertheless,
+   `.mpp.yaml`). generated files are committed to the repository. Nevertheless,
    if you need to regenerate them, use `make test-data`.
 
  * `./sources/`:
diff --git a/test/data/manifests/arch/arch-build.mpp.json b/test/data/manifests/arch/arch-build.mpp.yaml
similarity index 100%
rename from test/data/manifests/arch/arch-build.mpp.json
rename to test/data/manifests/arch/arch-build.mpp.yaml
diff --git a/test/data/manifests/arch/arch-vagrant-libvirt.mpp.json b/test/data/manifests/arch/arch-vagrant-libvirt.mpp.yaml
similarity index 100%
rename from test/data/manifests/arch/arch-vagrant-libvirt.mpp.json
rename to test/data/manifests/arch/arch-vagrant-libvirt.mpp.yaml
diff --git a/test/data/manifests/centos-stream-build.mpp.json b/test/data/manifests/centos-stream-build.mpp.yaml
similarity index 100%
rename from test/data/manifests/centos-stream-build.mpp.json
rename to test/data/manifests/centos-stream-build.mpp.yaml
diff --git a/test/data/manifests/centos-stream-uki.mpp.json b/test/data/manifests/centos-stream-uki.mpp.yaml
similarity index 99%
rename from test/data/manifests/centos-stream-uki.mpp.json
rename to test/data/manifests/centos-stream-uki.mpp.yaml
index 1ff0201b..159c6685 100644
--- a/test/data/manifests/centos-stream-uki.mpp.json
+++ b/test/data/manifests/centos-stream-uki.mpp.yaml
@@ -10,7 +10,7 @@
   "pipelines": [
     {
       "mpp-import-pipeline": {
-        "path": "centos-stream-build.mpp.json",
+        "path": "centos-stream-build.mpp.yaml",
         "id": "build"
       },
       "runner": {
diff --git a/test/data/manifests/f34-base.mpp.json b/test/data/manifests/f34-base.mpp.yaml
similarity index 100%
rename from test/data/manifests/f34-base.mpp.json
rename to test/data/manifests/f34-base.mpp.yaml
diff --git a/test/data/manifests/f34-build-v2.mpp.json b/test/data/manifests/f34-build-v2.mpp.yaml
similarity index 100%
rename from test/data/manifests/f34-build-v2.mpp.json
rename to test/data/manifests/f34-build-v2.mpp.yaml
diff --git a/test/data/manifests/f34-build.mpp.json b/test/data/manifests/f34-build.mpp.yaml
similarity index 100%
rename from test/data/manifests/f34-build.mpp.json
rename to test/data/manifests/f34-build.mpp.yaml
diff --git a/test/data/manifests/fedora-boot.mpp.json b/test/data/manifests/fedora-boot.mpp.yaml
similarity index 99%
rename from test/data/manifests/fedora-boot.mpp.json
rename to test/data/manifests/fedora-boot.mpp.yaml
index 522885f3..4676907b 100644
--- a/test/data/manifests/fedora-boot.mpp.json
+++ b/test/data/manifests/fedora-boot.mpp.yaml
@@ -8,7 +8,7 @@
   "pipeline": {
     "build": {
       "mpp-import-pipeline": {
-        "path": "fedora-build.mpp.json"
+        "path": "fedora-build.mpp.yaml"
       },
       "runner": {
         "mpp-format-string": "org.osbuild.fedora{release}"
diff --git a/test/data/manifests/fedora-build-v2.mpp.json b/test/data/manifests/fedora-build-v2.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-build-v2.mpp.json
rename to test/data/manifests/fedora-build-v2.mpp.yaml
diff --git a/test/data/manifests/fedora-build.mpp.json b/test/data/manifests/fedora-build.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-build.mpp.json
rename to test/data/manifests/fedora-build.mpp.yaml
diff --git a/test/data/manifests/fedora-container.mpp.json b/test/data/manifests/fedora-container.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-container.mpp.json
rename to test/data/manifests/fedora-container.mpp.yaml
diff --git a/test/data/manifests/fedora-ostree-bootiso-xz.mpp.json b/test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-ostree-bootiso-xz.mpp.json
rename to test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml
diff --git a/test/data/manifests/fedora-ostree-bootiso.mpp.json b/test/data/manifests/fedora-ostree-bootiso.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-ostree-bootiso.mpp.json
rename to test/data/manifests/fedora-ostree-bootiso.mpp.yaml
diff --git a/test/data/manifests/fedora-ostree-commit.mpp.json b/test/data/manifests/fedora-ostree-commit.mpp.yaml
similarity index 99%
rename from test/data/manifests/fedora-ostree-commit.mpp.json
rename to test/data/manifests/fedora-ostree-commit.mpp.yaml
index 24706293..eb9990cc 100644
--- a/test/data/manifests/fedora-ostree-commit.mpp.json
+++ b/test/data/manifests/fedora-ostree-commit.mpp.yaml
@@ -10,7 +10,7 @@
   "pipelines": [
     {
       "mpp-import-pipeline": {
-        "path": "fedora-build-v2.mpp.json",
+        "path": "fedora-build-v2.mpp.yaml",
         "id": "build"
       },
       "runner": {
diff --git a/test/data/manifests/fedora-ostree-container.mpp.json b/test/data/manifests/fedora-ostree-container.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-ostree-container.mpp.json
rename to test/data/manifests/fedora-ostree-container.mpp.yaml
diff --git a/test/data/manifests/fedora-ostree-image.mpp.json b/test/data/manifests/fedora-ostree-image.mpp.yaml
similarity index 99%
rename from test/data/manifests/fedora-ostree-image.mpp.json
rename to test/data/manifests/fedora-ostree-image.mpp.yaml
index b14b1b23..ff510583 100644
--- a/test/data/manifests/fedora-ostree-image.mpp.json
+++ b/test/data/manifests/fedora-ostree-image.mpp.yaml
@@ -44,7 +44,7 @@
   "pipelines": [
     {
       "mpp-import-pipeline": {
-        "path": "fedora-build-v2.mpp.json",
+        "path": "fedora-build-v2.mpp.yaml",
         "id": "build"
       },
       "runner": {
@@ -53,7 +53,7 @@
     },
     {
       "mpp-import-pipelines": {
-        "path": "fedora-ostree-commit.mpp.json",
+        "path": "fedora-ostree-commit.mpp.yaml",
         "ids": [
           "ostree-tree",
           "ostree-commit"
diff --git a/test/data/manifests/fedora-ostree-native-container.mpp.json b/test/data/manifests/fedora-ostree-native-container.mpp.yaml
similarity index 91%
rename from test/data/manifests/fedora-ostree-native-container.mpp.json
rename to test/data/manifests/fedora-ostree-native-container.mpp.yaml
index 8a724185..4156121b 100644
--- a/test/data/manifests/fedora-ostree-native-container.mpp.json
+++ b/test/data/manifests/fedora-ostree-native-container.mpp.yaml
@@ -10,7 +10,7 @@
   "pipelines": [
     {
       "mpp-import-pipeline": {
-        "path": "fedora-build-v2.mpp.json",
+        "path": "fedora-build-v2.mpp.yaml",
         "id": "build"
       },
       "runner": {
@@ -19,7 +19,7 @@
     },
     {
       "mpp-import-pipelines": {
-        "path": "fedora-ostree-commit.mpp.json",
+        "path": "fedora-ostree-commit.mpp.yaml",
         "ids": [
           "ostree-tree",
           "ostree-commit"
diff --git a/test/data/manifests/fedora-ostree-tarball.mpp.json b/test/data/manifests/fedora-ostree-tarball.mpp.yaml
similarity index 100%
rename from test/data/manifests/fedora-ostree-tarball.mpp.json
rename to test/data/manifests/fedora-ostree-tarball.mpp.yaml
diff --git a/test/data/manifests/fedora-uki.mpp.json b/test/data/manifests/fedora-uki.mpp.yaml
similarity index 99%
rename from test/data/manifests/fedora-uki.mpp.json
rename to test/data/manifests/fedora-uki.mpp.yaml
index bda15d52..4090ac9a 100644
--- a/test/data/manifests/fedora-uki.mpp.json
+++ b/test/data/manifests/fedora-uki.mpp.yaml
@@ -10,7 +10,7 @@
   "pipelines": [
     {
       "mpp-import-pipeline": {
-        "path": "fedora-build-v2.mpp.json",
+        "path": "fedora-build-v2.mpp.yaml",
         "id": "build"
       },
       "runner": {
diff --git a/test/data/manifests/filesystem.mpp.json b/test/data/manifests/filesystem.mpp.yaml
similarity index 100%
rename from test/data/manifests/filesystem.mpp.json
rename to test/data/manifests/filesystem.mpp.yaml
diff --git a/test/data/manifests/rhel/el7-build.mpp.json b/test/data/manifests/rhel/el7-build.mpp.yaml
similarity index 100%
rename from test/data/manifests/rhel/el7-build.mpp.json
rename to test/data/manifests/rhel/el7-build.mpp.yaml
diff --git a/test/data/manifests/rhel/el7-qcow2.mpp.json b/test/data/manifests/rhel/el7-qcow2.mpp.yaml
similarity index 100%
rename from test/data/manifests/rhel/el7-qcow2.mpp.json
rename to test/data/manifests/rhel/el7-qcow2.mpp.yaml
diff --git a/test/data/stages/authconfig/a.mpp.json b/test/data/stages/authconfig/a.mpp.yaml
similarity index 100%
rename from test/data/stages/authconfig/a.mpp.json
rename to test/data/stages/authconfig/a.mpp.yaml
diff --git a/test/data/stages/authconfig/b.mpp.json b/test/data/stages/authconfig/b.mpp.yaml
similarity index 100%
rename from test/data/stages/authconfig/b.mpp.json
rename to test/data/stages/authconfig/b.mpp.yaml
diff --git a/test/data/stages/authselect/a.mpp.json b/test/data/stages/authselect/a.mpp.yaml
similarity index 100%
rename from test/data/stages/authselect/a.mpp.json
rename to test/data/stages/authselect/a.mpp.yaml
diff --git a/test/data/stages/authselect/b.mpp.json b/test/data/stages/authselect/b.mpp.yaml
similarity index 100%
rename from test/data/stages/authselect/b.mpp.json
rename to test/data/stages/authselect/b.mpp.yaml
diff --git a/test/data/stages/chmod/a.mpp.json b/test/data/stages/chmod/a.mpp.yaml
similarity index 100%
rename from test/data/stages/chmod/a.mpp.json
rename to test/data/stages/chmod/a.mpp.yaml
diff --git a/test/data/stages/chmod/b.mpp.json b/test/data/stages/chmod/b.mpp.yaml
similarity index 100%
rename from test/data/stages/chmod/b.mpp.json
rename to test/data/stages/chmod/b.mpp.yaml
diff --git a/test/data/stages/chown/a.mpp.json b/test/data/stages/chown/a.mpp.yaml
similarity index 100%
rename from test/data/stages/chown/a.mpp.json
rename to test/data/stages/chown/a.mpp.yaml
diff --git a/test/data/stages/chown/b.mpp.json b/test/data/stages/chown/b.mpp.yaml
similarity index 100%
rename from test/data/stages/chown/b.mpp.json
rename to test/data/stages/chown/b.mpp.yaml
diff --git a/test/data/stages/chrony-servers/a.mpp.json b/test/data/stages/chrony-servers/a.mpp.yaml
similarity index 100%
rename from test/data/stages/chrony-servers/a.mpp.json
rename to test/data/stages/chrony-servers/a.mpp.yaml
diff --git a/test/data/stages/chrony-servers/b.mpp.json b/test/data/stages/chrony-servers/b.mpp.yaml
similarity index 100%
rename from test/data/stages/chrony-servers/b.mpp.json
rename to test/data/stages/chrony-servers/b.mpp.yaml
diff --git a/test/data/stages/chrony/a.mpp.json b/test/data/stages/chrony/a.mpp.yaml
similarity index 100%
rename from test/data/stages/chrony/a.mpp.json
rename to test/data/stages/chrony/a.mpp.yaml
diff --git a/test/data/stages/chrony/b.mpp.json b/test/data/stages/chrony/b.mpp.yaml
similarity index 100%
rename from test/data/stages/chrony/b.mpp.json
rename to test/data/stages/chrony/b.mpp.yaml
diff --git a/test/data/stages/cloud-init/a.mpp.json b/test/data/stages/cloud-init/a.mpp.yaml
similarity index 100%
rename from test/data/stages/cloud-init/a.mpp.json
rename to test/data/stages/cloud-init/a.mpp.yaml
diff --git a/test/data/stages/cloud-init/b.mpp.json b/test/data/stages/cloud-init/b.mpp.yaml
similarity index 100%
rename from test/data/stages/cloud-init/b.mpp.json
rename to test/data/stages/cloud-init/b.mpp.yaml
diff --git a/test/data/stages/containers.storage.conf/a.mpp.json b/test/data/stages/containers.storage.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/containers.storage.conf/a.mpp.json
rename to test/data/stages/containers.storage.conf/a.mpp.yaml
diff --git a/test/data/stages/containers.storage.conf/b.mpp.json b/test/data/stages/containers.storage.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/containers.storage.conf/b.mpp.json
rename to test/data/stages/containers.storage.conf/b.mpp.yaml
diff --git a/test/data/stages/copy/a.mpp.json b/test/data/stages/copy/a.mpp.yaml
similarity index 100%
rename from test/data/stages/copy/a.mpp.json
rename to test/data/stages/copy/a.mpp.yaml
diff --git a/test/data/stages/copy/b.mpp.json b/test/data/stages/copy/b.mpp.yaml
similarity index 100%
rename from test/data/stages/copy/b.mpp.json
rename to test/data/stages/copy/b.mpp.yaml
diff --git a/test/data/stages/cpio.out/a.mpp.json b/test/data/stages/cpio.out/a.mpp.yaml
similarity index 100%
rename from test/data/stages/cpio.out/a.mpp.json
rename to test/data/stages/cpio.out/a.mpp.yaml
diff --git a/test/data/stages/cpio.out/b.mpp.json b/test/data/stages/cpio.out/b.mpp.yaml
similarity index 100%
rename from test/data/stages/cpio.out/b.mpp.json
rename to test/data/stages/cpio.out/b.mpp.yaml
diff --git a/test/data/stages/cron.script/a.mpp.json b/test/data/stages/cron.script/a.mpp.yaml
similarity index 100%
rename from test/data/stages/cron.script/a.mpp.json
rename to test/data/stages/cron.script/a.mpp.yaml
diff --git a/test/data/stages/cron.script/b.mpp.json b/test/data/stages/cron.script/b.mpp.yaml
similarity index 100%
rename from test/data/stages/cron.script/b.mpp.json
rename to test/data/stages/cron.script/b.mpp.yaml
diff --git a/test/data/stages/dnf-automatic.config/a.mpp.json b/test/data/stages/dnf-automatic.config/a.mpp.yaml
similarity index 100%
rename from test/data/stages/dnf-automatic.config/a.mpp.json
rename to test/data/stages/dnf-automatic.config/a.mpp.yaml
diff --git a/test/data/stages/dnf-automatic.config/b.mpp.json b/test/data/stages/dnf-automatic.config/b.mpp.yaml
similarity index 100%
rename from test/data/stages/dnf-automatic.config/b.mpp.json
rename to test/data/stages/dnf-automatic.config/b.mpp.yaml
diff --git a/test/data/stages/dnf.config/a.mpp.json b/test/data/stages/dnf.config/a.mpp.yaml
similarity index 100%
rename from test/data/stages/dnf.config/a.mpp.json
rename to test/data/stages/dnf.config/a.mpp.yaml
diff --git a/test/data/stages/dnf.config/b.mpp.json b/test/data/stages/dnf.config/b.mpp.yaml
similarity index 100%
rename from test/data/stages/dnf.config/b.mpp.json
rename to test/data/stages/dnf.config/b.mpp.yaml
diff --git a/test/data/stages/dracut.conf/a.mpp.json b/test/data/stages/dracut.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/dracut.conf/a.mpp.json
rename to test/data/stages/dracut.conf/a.mpp.yaml
diff --git a/test/data/stages/dracut.conf/b.mpp.json b/test/data/stages/dracut.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/dracut.conf/b.mpp.json
rename to test/data/stages/dracut.conf/b.mpp.yaml
diff --git a/test/data/stages/dracut/template.mpp.json b/test/data/stages/dracut/template.mpp.yaml
similarity index 100%
rename from test/data/stages/dracut/template.mpp.json
rename to test/data/stages/dracut/template.mpp.yaml
diff --git a/test/data/stages/fdo/a.mpp.json b/test/data/stages/fdo/a.mpp.yaml
similarity index 100%
rename from test/data/stages/fdo/a.mpp.json
rename to test/data/stages/fdo/a.mpp.yaml
diff --git a/test/data/stages/fdo/b.mpp.json b/test/data/stages/fdo/b.mpp.yaml
similarity index 100%
rename from test/data/stages/fdo/b.mpp.json
rename to test/data/stages/fdo/b.mpp.yaml
diff --git a/test/data/stages/firewall/a.mpp.json b/test/data/stages/firewall/a.mpp.yaml
similarity index 100%
rename from test/data/stages/firewall/a.mpp.json
rename to test/data/stages/firewall/a.mpp.yaml
diff --git a/test/data/stages/firewall/b.mpp.json b/test/data/stages/firewall/b.mpp.yaml
similarity index 100%
rename from test/data/stages/firewall/b.mpp.json
rename to test/data/stages/firewall/b.mpp.yaml
diff --git a/test/data/stages/fstab/a.mpp.json b/test/data/stages/fstab/a.mpp.yaml
similarity index 100%
rename from test/data/stages/fstab/a.mpp.json
rename to test/data/stages/fstab/a.mpp.yaml
diff --git a/test/data/stages/fstab/b.mpp.json b/test/data/stages/fstab/b.mpp.yaml
similarity index 100%
rename from test/data/stages/fstab/b.mpp.json
rename to test/data/stages/fstab/b.mpp.yaml
diff --git a/test/data/stages/gcp.guest-agent.conf/a.mpp.json b/test/data/stages/gcp.guest-agent.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/gcp.guest-agent.conf/a.mpp.json
rename to test/data/stages/gcp.guest-agent.conf/a.mpp.yaml
diff --git a/test/data/stages/gcp.guest-agent.conf/b.mpp.json b/test/data/stages/gcp.guest-agent.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/gcp.guest-agent.conf/b.mpp.json
rename to test/data/stages/gcp.guest-agent.conf/b.mpp.yaml
diff --git a/test/data/stages/groups/a.mpp.json b/test/data/stages/groups/a.mpp.yaml
similarity index 100%
rename from test/data/stages/groups/a.mpp.json
rename to test/data/stages/groups/a.mpp.yaml
diff --git a/test/data/stages/groups/b.mpp.json b/test/data/stages/groups/b.mpp.yaml
similarity index 100%
rename from test/data/stages/groups/b.mpp.json
rename to test/data/stages/groups/b.mpp.yaml
diff --git a/test/data/stages/grub2.legacy/a.mpp.json b/test/data/stages/grub2.legacy/a.mpp.yaml
similarity index 100%
rename from test/data/stages/grub2.legacy/a.mpp.json
rename to test/data/stages/grub2.legacy/a.mpp.yaml
diff --git a/test/data/stages/grub2.legacy/b.mpp.json b/test/data/stages/grub2.legacy/b.mpp.yaml
similarity index 100%
rename from test/data/stages/grub2.legacy/b.mpp.json
rename to test/data/stages/grub2.legacy/b.mpp.yaml
diff --git a/test/data/stages/grub2/a.mpp.json b/test/data/stages/grub2/a.mpp.yaml
similarity index 100%
rename from test/data/stages/grub2/a.mpp.json
rename to test/data/stages/grub2/a.mpp.yaml
diff --git a/test/data/stages/grub2/b.mpp.json b/test/data/stages/grub2/b.mpp.yaml
similarity index 100%
rename from test/data/stages/grub2/b.mpp.json
rename to test/data/stages/grub2/b.mpp.yaml
diff --git a/test/data/stages/gunzip/a.mpp.json b/test/data/stages/gunzip/a.mpp.yaml
similarity index 100%
rename from test/data/stages/gunzip/a.mpp.json
rename to test/data/stages/gunzip/a.mpp.yaml
diff --git a/test/data/stages/gunzip/b.mpp.json b/test/data/stages/gunzip/b.mpp.yaml
similarity index 100%
rename from test/data/stages/gunzip/b.mpp.json
rename to test/data/stages/gunzip/b.mpp.yaml
diff --git a/test/data/stages/gzip/a.mpp.json b/test/data/stages/gzip/a.mpp.yaml
similarity index 100%
rename from test/data/stages/gzip/a.mpp.json
rename to test/data/stages/gzip/a.mpp.yaml
diff --git a/test/data/stages/gzip/b.mpp.json b/test/data/stages/gzip/b.mpp.yaml
similarity index 100%
rename from test/data/stages/gzip/b.mpp.json
rename to test/data/stages/gzip/b.mpp.yaml
diff --git a/test/data/stages/hostname/a.mpp.json b/test/data/stages/hostname/a.mpp.yaml
similarity index 100%
rename from test/data/stages/hostname/a.mpp.json
rename to test/data/stages/hostname/a.mpp.yaml
diff --git a/test/data/stages/hostname/b.mpp.json b/test/data/stages/hostname/b.mpp.yaml
similarity index 100%
rename from test/data/stages/hostname/b.mpp.json
rename to test/data/stages/hostname/b.mpp.yaml
diff --git a/test/data/stages/kernel-cmdline/a.mpp.json b/test/data/stages/kernel-cmdline/a.mpp.yaml
similarity index 100%
rename from test/data/stages/kernel-cmdline/a.mpp.json
rename to test/data/stages/kernel-cmdline/a.mpp.yaml
diff --git a/test/data/stages/kernel-cmdline/b.mpp.json b/test/data/stages/kernel-cmdline/b.mpp.yaml
similarity index 100%
rename from test/data/stages/kernel-cmdline/b.mpp.json
rename to test/data/stages/kernel-cmdline/b.mpp.yaml
diff --git a/test/data/stages/keymap/a.mpp.json b/test/data/stages/keymap/a.mpp.yaml
similarity index 100%
rename from test/data/stages/keymap/a.mpp.json
rename to test/data/stages/keymap/a.mpp.yaml
diff --git a/test/data/stages/keymap/b.mpp.json b/test/data/stages/keymap/b.mpp.yaml
similarity index 100%
rename from test/data/stages/keymap/b.mpp.json
rename to test/data/stages/keymap/b.mpp.yaml
diff --git a/test/data/stages/livesys/a.mpp.json b/test/data/stages/livesys/a.mpp.yaml
similarity index 100%
rename from test/data/stages/livesys/a.mpp.json
rename to test/data/stages/livesys/a.mpp.yaml
diff --git a/test/data/stages/livesys/b.mpp.json b/test/data/stages/livesys/b.mpp.yaml
similarity index 100%
rename from test/data/stages/livesys/b.mpp.json
rename to test/data/stages/livesys/b.mpp.yaml
diff --git a/test/data/stages/locale/a.mpp.json b/test/data/stages/locale/a.mpp.yaml
similarity index 100%
rename from test/data/stages/locale/a.mpp.json
rename to test/data/stages/locale/a.mpp.yaml
diff --git a/test/data/stages/locale/b.mpp.json b/test/data/stages/locale/b.mpp.yaml
similarity index 100%
rename from test/data/stages/locale/b.mpp.json
rename to test/data/stages/locale/b.mpp.yaml
diff --git a/test/data/stages/mkdir/a.mpp.json b/test/data/stages/mkdir/a.mpp.yaml
similarity index 100%
rename from test/data/stages/mkdir/a.mpp.json
rename to test/data/stages/mkdir/a.mpp.yaml
diff --git a/test/data/stages/mkdir/b.mpp.json b/test/data/stages/mkdir/b.mpp.yaml
similarity index 100%
rename from test/data/stages/mkdir/b.mpp.json
rename to test/data/stages/mkdir/b.mpp.yaml
diff --git a/test/data/stages/modprobe/a.mpp.json b/test/data/stages/modprobe/a.mpp.yaml
similarity index 100%
rename from test/data/stages/modprobe/a.mpp.json
rename to test/data/stages/modprobe/a.mpp.yaml
diff --git a/test/data/stages/modprobe/b.mpp.json b/test/data/stages/modprobe/b.mpp.yaml
similarity index 100%
rename from test/data/stages/modprobe/b.mpp.json
rename to test/data/stages/modprobe/b.mpp.yaml
diff --git a/test/data/stages/nginx.conf/a.mpp.json b/test/data/stages/nginx.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/nginx.conf/a.mpp.json
rename to test/data/stages/nginx.conf/a.mpp.yaml
diff --git a/test/data/stages/nginx.conf/b.mpp.json b/test/data/stages/nginx.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/nginx.conf/b.mpp.json
rename to test/data/stages/nginx.conf/b.mpp.yaml
diff --git a/test/data/stages/nm.conf/a.mpp.json b/test/data/stages/nm.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/nm.conf/a.mpp.json
rename to test/data/stages/nm.conf/a.mpp.yaml
diff --git a/test/data/stages/nm.conf/b.mpp.json b/test/data/stages/nm.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/nm.conf/b.mpp.json
rename to test/data/stages/nm.conf/b.mpp.yaml
diff --git a/test/data/stages/nm.conn/a.mpp.json b/test/data/stages/nm.conn/a.mpp.yaml
similarity index 100%
rename from test/data/stages/nm.conn/a.mpp.json
rename to test/data/stages/nm.conn/a.mpp.yaml
diff --git a/test/data/stages/nm.conn/b.mpp.json b/test/data/stages/nm.conn/b.mpp.yaml
similarity index 100%
rename from test/data/stages/nm.conn/b.mpp.json
rename to test/data/stages/nm.conn/b.mpp.yaml
diff --git a/test/data/stages/oscap.autotailor/a.mpp.json b/test/data/stages/oscap.autotailor/a.mpp.yaml
similarity index 100%
rename from test/data/stages/oscap.autotailor/a.mpp.json
rename to test/data/stages/oscap.autotailor/a.mpp.yaml
diff --git a/test/data/stages/oscap.autotailor/b.mpp.json b/test/data/stages/oscap.autotailor/b.mpp.yaml
similarity index 100%
rename from test/data/stages/oscap.autotailor/b.mpp.json
rename to test/data/stages/oscap.autotailor/b.mpp.yaml
diff --git a/test/data/stages/oscap.remediation/a.mpp.json b/test/data/stages/oscap.remediation/a.mpp.yaml
similarity index 100%
rename from test/data/stages/oscap.remediation/a.mpp.json
rename to test/data/stages/oscap.remediation/a.mpp.yaml
diff --git a/test/data/stages/oscap.remediation/b.mpp.json b/test/data/stages/oscap.remediation/b.mpp.yaml
similarity index 100%
rename from test/data/stages/oscap.remediation/b.mpp.json
rename to test/data/stages/oscap.remediation/b.mpp.yaml
diff --git a/test/data/stages/ovf/ovf.mpp.json b/test/data/stages/ovf/ovf.mpp.yaml
similarity index 100%
rename from test/data/stages/ovf/ovf.mpp.json
rename to test/data/stages/ovf/ovf.mpp.yaml
diff --git a/test/data/stages/pam.limits.conf/a.mpp.json b/test/data/stages/pam.limits.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/pam.limits.conf/a.mpp.json
rename to test/data/stages/pam.limits.conf/a.mpp.yaml
diff --git a/test/data/stages/pam.limits.conf/b.mpp.json b/test/data/stages/pam.limits.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/pam.limits.conf/b.mpp.json
rename to test/data/stages/pam.limits.conf/b.mpp.yaml
diff --git a/test/data/stages/parted/parted.mpp.json b/test/data/stages/parted/parted.mpp.yaml
similarity index 100%
rename from test/data/stages/parted/parted.mpp.json
rename to test/data/stages/parted/parted.mpp.yaml
diff --git a/test/data/stages/pwquality.conf/a.mpp.json b/test/data/stages/pwquality.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/pwquality.conf/a.mpp.json
rename to test/data/stages/pwquality.conf/a.mpp.yaml
diff --git a/test/data/stages/pwquality.conf/b.mpp.json b/test/data/stages/pwquality.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/pwquality.conf/b.mpp.json
rename to test/data/stages/pwquality.conf/b.mpp.yaml
diff --git a/test/data/stages/qemu/qemu.mpp.json b/test/data/stages/qemu/qemu.mpp.yaml
similarity index 100%
rename from test/data/stages/qemu/qemu.mpp.json
rename to test/data/stages/qemu/qemu.mpp.yaml
diff --git a/test/data/stages/resolv-conf/a.mpp.json b/test/data/stages/resolv-conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/resolv-conf/a.mpp.json
rename to test/data/stages/resolv-conf/a.mpp.yaml
diff --git a/test/data/stages/resolv-conf/b.mpp.json b/test/data/stages/resolv-conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/resolv-conf/b.mpp.json
rename to test/data/stages/resolv-conf/b.mpp.yaml
diff --git a/test/data/stages/rhsm.facts/a.mpp.json b/test/data/stages/rhsm.facts/a.mpp.yaml
similarity index 100%
rename from test/data/stages/rhsm.facts/a.mpp.json
rename to test/data/stages/rhsm.facts/a.mpp.yaml
diff --git a/test/data/stages/rhsm.facts/b.mpp.json b/test/data/stages/rhsm.facts/b.mpp.yaml
similarity index 100%
rename from test/data/stages/rhsm.facts/b.mpp.json
rename to test/data/stages/rhsm.facts/b.mpp.yaml
diff --git a/test/data/stages/rhsm/a.mpp.json b/test/data/stages/rhsm/a.mpp.yaml
similarity index 100%
rename from test/data/stages/rhsm/a.mpp.json
rename to test/data/stages/rhsm/a.mpp.yaml
diff --git a/test/data/stages/rhsm/b.mpp.json b/test/data/stages/rhsm/b.mpp.yaml
similarity index 100%
rename from test/data/stages/rhsm/b.mpp.json
rename to test/data/stages/rhsm/b.mpp.yaml
diff --git a/test/data/stages/rpm.macros/a.mpp.json b/test/data/stages/rpm.macros/a.mpp.yaml
similarity index 100%
rename from test/data/stages/rpm.macros/a.mpp.json
rename to test/data/stages/rpm.macros/a.mpp.yaml
diff --git a/test/data/stages/rpm.macros/b.mpp.json b/test/data/stages/rpm.macros/b.mpp.yaml
similarity index 100%
rename from test/data/stages/rpm.macros/b.mpp.json
rename to test/data/stages/rpm.macros/b.mpp.yaml
diff --git a/test/data/stages/rpm/b.mpp.json b/test/data/stages/rpm/b.mpp.yaml
similarity index 100%
rename from test/data/stages/rpm/b.mpp.json
rename to test/data/stages/rpm/b.mpp.yaml
diff --git a/test/data/stages/rpmkeys.import/a.mpp.json b/test/data/stages/rpmkeys.import/a.mpp.yaml
similarity index 100%
rename from test/data/stages/rpmkeys.import/a.mpp.json
rename to test/data/stages/rpmkeys.import/a.mpp.yaml
diff --git a/test/data/stages/rpmkeys.import/b.mpp.json b/test/data/stages/rpmkeys.import/b.mpp.yaml
similarity index 100%
rename from test/data/stages/rpmkeys.import/b.mpp.json
rename to test/data/stages/rpmkeys.import/b.mpp.yaml
diff --git a/test/data/stages/selinux.config/a.mpp.json b/test/data/stages/selinux.config/a.mpp.yaml
similarity index 100%
rename from test/data/stages/selinux.config/a.mpp.json
rename to test/data/stages/selinux.config/a.mpp.yaml
diff --git a/test/data/stages/selinux.config/b.mpp.json b/test/data/stages/selinux.config/b.mpp.yaml
similarity index 100%
rename from test/data/stages/selinux.config/b.mpp.json
rename to test/data/stages/selinux.config/b.mpp.yaml
diff --git a/test/data/stages/sfdisk/sfdisk.mpp.json b/test/data/stages/sfdisk/sfdisk.mpp.yaml
similarity index 100%
rename from test/data/stages/sfdisk/sfdisk.mpp.json
rename to test/data/stages/sfdisk/sfdisk.mpp.yaml
diff --git a/test/data/stages/sgdisk/sgdisk.mpp.json b/test/data/stages/sgdisk/sgdisk.mpp.yaml
similarity index 100%
rename from test/data/stages/sgdisk/sgdisk.mpp.json
rename to test/data/stages/sgdisk/sgdisk.mpp.yaml
diff --git a/test/data/stages/shell.init/a.mpp.json b/test/data/stages/shell.init/a.mpp.yaml
similarity index 100%
rename from test/data/stages/shell.init/a.mpp.json
rename to test/data/stages/shell.init/a.mpp.yaml
diff --git a/test/data/stages/shell.init/b.mpp.json b/test/data/stages/shell.init/b.mpp.yaml
similarity index 100%
rename from test/data/stages/shell.init/b.mpp.json
rename to test/data/stages/shell.init/b.mpp.yaml
diff --git a/test/data/stages/skopeo/a.mpp.json b/test/data/stages/skopeo/a.mpp.yaml
similarity index 100%
rename from test/data/stages/skopeo/a.mpp.json
rename to test/data/stages/skopeo/a.mpp.yaml
diff --git a/test/data/stages/skopeo/b.mpp.json b/test/data/stages/skopeo/b.mpp.yaml
similarity index 100%
rename from test/data/stages/skopeo/b.mpp.json
rename to test/data/stages/skopeo/b.mpp.yaml
diff --git a/test/data/stages/sshd.config/a.mpp.json b/test/data/stages/sshd.config/a.mpp.yaml
similarity index 100%
rename from test/data/stages/sshd.config/a.mpp.json
rename to test/data/stages/sshd.config/a.mpp.yaml
diff --git a/test/data/stages/sshd.config/b.mpp.json b/test/data/stages/sshd.config/b.mpp.yaml
similarity index 100%
rename from test/data/stages/sshd.config/b.mpp.json
rename to test/data/stages/sshd.config/b.mpp.yaml
diff --git a/test/data/stages/sysconfig/a.mpp.json b/test/data/stages/sysconfig/a.mpp.yaml
similarity index 100%
rename from test/data/stages/sysconfig/a.mpp.json
rename to test/data/stages/sysconfig/a.mpp.yaml
diff --git a/test/data/stages/sysconfig/b.mpp.json b/test/data/stages/sysconfig/b.mpp.yaml
similarity index 100%
rename from test/data/stages/sysconfig/b.mpp.json
rename to test/data/stages/sysconfig/b.mpp.yaml
diff --git a/test/data/stages/sysctld/a.mpp.json b/test/data/stages/sysctld/a.mpp.yaml
similarity index 100%
rename from test/data/stages/sysctld/a.mpp.json
rename to test/data/stages/sysctld/a.mpp.yaml
diff --git a/test/data/stages/sysctld/b.mpp.json b/test/data/stages/sysctld/b.mpp.yaml
similarity index 100%
rename from test/data/stages/sysctld/b.mpp.json
rename to test/data/stages/sysctld/b.mpp.yaml
diff --git a/test/data/stages/systemd-journald/a.mpp.json b/test/data/stages/systemd-journald/a.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd-journald/a.mpp.json
rename to test/data/stages/systemd-journald/a.mpp.yaml
diff --git a/test/data/stages/systemd-journald/b.mpp.json b/test/data/stages/systemd-journald/b.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd-journald/b.mpp.json
rename to test/data/stages/systemd-journald/b.mpp.yaml
diff --git a/test/data/stages/systemd-logind/a.mpp.json b/test/data/stages/systemd-logind/a.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd-logind/a.mpp.json
rename to test/data/stages/systemd-logind/a.mpp.yaml
diff --git a/test/data/stages/systemd-logind/b.mpp.json b/test/data/stages/systemd-logind/b.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd-logind/b.mpp.json
rename to test/data/stages/systemd-logind/b.mpp.yaml
diff --git a/test/data/stages/systemd.preset/a.mpp.json b/test/data/stages/systemd.preset/a.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd.preset/a.mpp.json
rename to test/data/stages/systemd.preset/a.mpp.yaml
diff --git a/test/data/stages/systemd.preset/b.mpp.json b/test/data/stages/systemd.preset/b.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd.preset/b.mpp.json
rename to test/data/stages/systemd.preset/b.mpp.yaml
diff --git a/test/data/stages/systemd.unit/a.mpp.json b/test/data/stages/systemd.unit/a.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd.unit/a.mpp.json
rename to test/data/stages/systemd.unit/a.mpp.yaml
diff --git a/test/data/stages/systemd.unit/b.mpp.json b/test/data/stages/systemd.unit/b.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd.unit/b.mpp.json
rename to test/data/stages/systemd.unit/b.mpp.yaml
diff --git a/test/data/stages/systemd/a.mpp.json b/test/data/stages/systemd/a.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd/a.mpp.json
rename to test/data/stages/systemd/a.mpp.yaml
diff --git a/test/data/stages/systemd/b.mpp.json b/test/data/stages/systemd/b.mpp.yaml
similarity index 100%
rename from test/data/stages/systemd/b.mpp.json
rename to test/data/stages/systemd/b.mpp.yaml
diff --git a/test/data/stages/tar/tar.mpp.json b/test/data/stages/tar/tar.mpp.yaml
similarity index 100%
rename from test/data/stages/tar/tar.mpp.json
rename to test/data/stages/tar/tar.mpp.yaml
diff --git a/test/data/stages/timezone/a.mpp.json b/test/data/stages/timezone/a.mpp.yaml
similarity index 100%
rename from test/data/stages/timezone/a.mpp.json
rename to test/data/stages/timezone/a.mpp.yaml
diff --git a/test/data/stages/timezone/b.mpp.json b/test/data/stages/timezone/b.mpp.yaml
similarity index 100%
rename from test/data/stages/timezone/b.mpp.json
rename to test/data/stages/timezone/b.mpp.yaml
diff --git a/test/data/stages/tmpfilesd/a.mpp.json b/test/data/stages/tmpfilesd/a.mpp.yaml
similarity index 100%
rename from test/data/stages/tmpfilesd/a.mpp.json
rename to test/data/stages/tmpfilesd/a.mpp.yaml
diff --git a/test/data/stages/tmpfilesd/b.mpp.json b/test/data/stages/tmpfilesd/b.mpp.yaml
similarity index 100%
rename from test/data/stages/tmpfilesd/b.mpp.json
rename to test/data/stages/tmpfilesd/b.mpp.yaml
diff --git a/test/data/stages/tuned/a.mpp.json b/test/data/stages/tuned/a.mpp.yaml
similarity index 100%
rename from test/data/stages/tuned/a.mpp.json
rename to test/data/stages/tuned/a.mpp.yaml
diff --git a/test/data/stages/tuned/b.mpp.json b/test/data/stages/tuned/b.mpp.yaml
similarity index 100%
rename from test/data/stages/tuned/b.mpp.json
rename to test/data/stages/tuned/b.mpp.yaml
diff --git a/test/data/stages/udev.rules/a.mpp.json b/test/data/stages/udev.rules/a.mpp.yaml
similarity index 100%
rename from test/data/stages/udev.rules/a.mpp.json
rename to test/data/stages/udev.rules/a.mpp.yaml
diff --git a/test/data/stages/udev.rules/b.mpp.json b/test/data/stages/udev.rules/b.mpp.yaml
similarity index 100%
rename from test/data/stages/udev.rules/b.mpp.json
rename to test/data/stages/udev.rules/b.mpp.yaml
diff --git a/test/data/stages/untar/a.mpp.json b/test/data/stages/untar/a.mpp.yaml
similarity index 100%
rename from test/data/stages/untar/a.mpp.json
rename to test/data/stages/untar/a.mpp.yaml
diff --git a/test/data/stages/untar/b.mpp.json b/test/data/stages/untar/b.mpp.yaml
similarity index 100%
rename from test/data/stages/untar/b.mpp.json
rename to test/data/stages/untar/b.mpp.yaml
diff --git a/test/data/stages/users/a.mpp.json b/test/data/stages/users/a.mpp.yaml
similarity index 100%
rename from test/data/stages/users/a.mpp.json
rename to test/data/stages/users/a.mpp.yaml
diff --git a/test/data/stages/users/b.mpp.json b/test/data/stages/users/b.mpp.yaml
similarity index 100%
rename from test/data/stages/users/b.mpp.json
rename to test/data/stages/users/b.mpp.yaml
diff --git a/test/data/stages/waagent.conf/a.mpp.json b/test/data/stages/waagent.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/waagent.conf/a.mpp.json
rename to test/data/stages/waagent.conf/a.mpp.yaml
diff --git a/test/data/stages/waagent.conf/b.mpp.json b/test/data/stages/waagent.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/waagent.conf/b.mpp.json
rename to test/data/stages/waagent.conf/b.mpp.yaml
diff --git a/test/data/stages/wsl.conf/a.mpp.json b/test/data/stages/wsl.conf/a.mpp.yaml
similarity index 100%
rename from test/data/stages/wsl.conf/a.mpp.json
rename to test/data/stages/wsl.conf/a.mpp.yaml
diff --git a/test/data/stages/wsl.conf/b.mpp.json b/test/data/stages/wsl.conf/b.mpp.yaml
similarity index 100%
rename from test/data/stages/wsl.conf/b.mpp.json
rename to test/data/stages/wsl.conf/b.mpp.yaml
diff --git a/test/data/stages/xz/a.mpp.json b/test/data/stages/xz/a.mpp.yaml
similarity index 100%
rename from test/data/stages/xz/a.mpp.json
rename to test/data/stages/xz/a.mpp.yaml
diff --git a/test/data/stages/xz/b.mpp.json b/test/data/stages/xz/b.mpp.yaml
similarity index 100%
rename from test/data/stages/xz/b.mpp.json
rename to test/data/stages/xz/b.mpp.yaml
diff --git a/test/data/stages/yum.config/a.mpp.json b/test/data/stages/yum.config/a.mpp.yaml
similarity index 100%
rename from test/data/stages/yum.config/a.mpp.json
rename to test/data/stages/yum.config/a.mpp.yaml
diff --git a/test/data/stages/yum.config/b.mpp.json b/test/data/stages/yum.config/b.mpp.yaml
similarity index 100%
rename from test/data/stages/yum.config/b.mpp.json
rename to test/data/stages/yum.config/b.mpp.yaml
diff --git a/test/data/stages/yum.repos/a.mpp.json b/test/data/stages/yum.repos/a.mpp.yaml
similarity index 100%
rename from test/data/stages/yum.repos/a.mpp.json
rename to test/data/stages/yum.repos/a.mpp.yaml
diff --git a/test/data/stages/yum.repos/b.mpp.json b/test/data/stages/yum.repos/b.mpp.yaml
similarity index 100%
rename from test/data/stages/yum.repos/b.mpp.json
rename to test/data/stages/yum.repos/b.mpp.yaml
diff --git a/test/data/stages/zipl/a.mpp.json b/test/data/stages/zipl/a.mpp.yaml
similarity index 100%
rename from test/data/stages/zipl/a.mpp.json
rename to test/data/stages/zipl/a.mpp.yaml
diff --git a/test/data/stages/zipl/b.mpp.json b/test/data/stages/zipl/b.mpp.yaml
similarity index 100%
rename from test/data/stages/zipl/b.mpp.json
rename to test/data/stages/zipl/b.mpp.yaml
diff --git a/test/data/stages/zstd/a.mpp.json b/test/data/stages/zstd/a.mpp.yaml
similarity index 100%
rename from test/data/stages/zstd/a.mpp.json
rename to test/data/stages/zstd/a.mpp.yaml
diff --git a/test/data/stages/zstd/b.mpp.json b/test/data/stages/zstd/b.mpp.yaml
similarity index 100%
rename from test/data/stages/zstd/b.mpp.json
rename to test/data/stages/zstd/b.mpp.yaml