From baca25f7cb50785153b08694121f554cdfc031c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Thu, 27 Jul 2023 20:22:50 +0200 Subject: [PATCH] manifests: fix module_platform_id module_platform_id has a format of `platform:f34`. I have no idea why just `f34` is used. Let's fix it. This change is applied only to manifests based on fedora-build-v2 for now. --- test/data/manifests/fedora-build-v2.ipp.yaml | 2 +- test/data/manifests/fedora-build.mpp.yaml | 2 +- test/data/manifests/fedora-ostree-commit.mpp.yaml | 3 +-- test/data/manifests/fedora-uki.mpp.yaml | 3 +-- test/data/manifests/fedora-vars.ipp.yaml | 1 + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/data/manifests/fedora-build-v2.ipp.yaml b/test/data/manifests/fedora-build-v2.ipp.yaml index a3907952..22ba3807 100644 --- a/test/data/manifests/fedora-build-v2.ipp.yaml +++ b/test/data/manifests/fedora-build-v2.ipp.yaml @@ -10,7 +10,7 @@ pipelines: origin: org.osbuild.source mpp-depsolve: architecture: $arch - module-platform-id: $releasever + module-platform-id: $module_platform_id repos: mpp-eval: repos packages: diff --git a/test/data/manifests/fedora-build.mpp.yaml b/test/data/manifests/fedora-build.mpp.yaml index 6cc3a18a..fa175e02 100644 --- a/test/data/manifests/fedora-build.mpp.yaml +++ b/test/data/manifests/fedora-build.mpp.yaml @@ -6,7 +6,7 @@ pipeline: - "-----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 + module-platform-id: $module_platform_id repos: - id: default baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ diff --git a/test/data/manifests/fedora-ostree-commit.mpp.yaml b/test/data/manifests/fedora-ostree-commit.mpp.yaml index dfe9a68b..0672eba0 100644 --- a/test/data/manifests/fedora-ostree-commit.mpp.yaml +++ b/test/data/manifests/fedora-ostree-commit.mpp.yaml @@ -28,8 +28,7 @@ pipelines: origin: org.osbuild.source mpp-depsolve: architecture: $arch - module-platform-id: $releasever - releasever: $releasever + module-platform-id: $module_platform_id repos: mpp-eval: repos packages: diff --git a/test/data/manifests/fedora-uki.mpp.yaml b/test/data/manifests/fedora-uki.mpp.yaml index cc216d51..5838f8c2 100644 --- a/test/data/manifests/fedora-uki.mpp.yaml +++ b/test/data/manifests/fedora-uki.mpp.yaml @@ -17,8 +17,7 @@ pipelines: origin: org.osbuild.source mpp-depsolve: architecture: $arch - module-platform-id: $releasever - releasever: $releasever + module-platform-id: $module_platform_id repos: mpp-eval: repos packages: diff --git a/test/data/manifests/fedora-vars.ipp.yaml b/test/data/manifests/fedora-vars.ipp.yaml index 4d76e10d..8531dd93 100644 --- a/test/data/manifests/fedora-vars.ipp.yaml +++ b/test/data/manifests/fedora-vars.ipp.yaml @@ -4,6 +4,7 @@ mpp-vars: arch: x86_64 release: 36 releasever: f$release + module_platform_id: platform:$releasever snapshot: '20220617' updates: '20220801' repos: