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.
This commit is contained in:
Ondřej Budai 2023-07-27 17:00:58 +02:00 committed by Simon de Vlieger
parent 2d23f9c17c
commit d827be2fb2
164 changed files with 15 additions and 15 deletions

View file

@ -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

View file

@ -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/`:

View file

@ -10,7 +10,7 @@
"pipelines": [
{
"mpp-import-pipeline": {
"path": "centos-stream-build.mpp.json",
"path": "centos-stream-build.mpp.yaml",
"id": "build"
},
"runner": {

View file

@ -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}"

View file

@ -10,7 +10,7 @@
"pipelines": [
{
"mpp-import-pipeline": {
"path": "fedora-build-v2.mpp.json",
"path": "fedora-build-v2.mpp.yaml",
"id": "build"
},
"runner": {

View file

@ -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"

View file

@ -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"

View file

@ -10,7 +10,7 @@
"pipelines": [
{
"mpp-import-pipeline": {
"path": "fedora-build-v2.mpp.json",
"path": "fedora-build-v2.mpp.yaml",
"id": "build"
},
"runner": {

Some files were not shown because too many files have changed in this diff Show more