particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

manifests: convert ostree commit to format v2

Browse source 
Convert the manifest to use version 2 format. Version 1 is really
not used much anymore because composer was completely ported to
using v2. Welcome to the future, ostree commit.
This commit is contained in:
Christian Kellner 2022-08-08 15:11:07 +02:00 • committed by Tom Gundersen
parent c3b172e16b
commit 4b11989ce3
3 changed files with 967 additions and 826 deletions
Download patch file Download diff file Expand all files Collapse all files

1581
test/data/manifests/fedora-ostree-commit.json
View file

File diff suppressed because it is too large Load diff

196
test/data/manifests/fedora-ostree-commit.mpp.json
View file

@ -1,109 +1,113 @@
{
"pipeline": {
"build": {
"version": "2",
"pipelines": [
{
"mpp-import-pipeline": {
"path": "f34-build.json"
"path": "f34-build-v2.json",
"id": "build"
},
"runner": "org.osbuild.fedora34"
},
"stages": [
{
"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": "x86_64",
"module-platform-id": "f34",
"repos": [
{
"id": "default",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/"
{
"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"
]
},
"inputs": {
"packages": {
"type": "org.osbuild.files",
"origin": "org.osbuild.source",
"mpp-depsolve": {
"architecture": "x86_64",
"module-platform-id": "f34",
"repos": [
{
"id": "default",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/"
}
],
"packages": [
"@cloud-server-environment",
"chrony",
"cryptsetup",
"dracut-config-generic",
"greenboot-grub2",
"greenboot-reboot",
"greenboot-rpm-ostree-grub2",
"greenboot-status",
"greenboot",
"grub2-pc",
"kernel-core",
"langpacks-en",
"lvm2",
"nss-altfiles",
"polkit",
"rpm-ostree",
"selinux-policy-targeted"
],
"excludes": [
"dracut-config-rescue"
]
}
],
"packages": [
"@cloud-server-environment",
"chrony",
"cryptsetup",
"dracut-config-generic",
"greenboot-grub2",
"greenboot-reboot",
"greenboot-rpm-ostree-grub2",
"greenboot-status",
"greenboot",
"grub2-pc",
"kernel-core",
"langpacks-en",
"lvm2",
"nss-altfiles",
"polkit",
"rpm-ostree",
"selinux-policy-targeted"
],
"excludes": [
"dracut-config-rescue"
}
}
},
{
"type": "org.osbuild.locale",
"options": {
"language": "en_US.UTF-8"
}
},
{
"type": "org.osbuild.selinux",
"options": {
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
}
},
{
"type": "org.osbuild.ostree.preptree",
"options": {
"etc_group_members": [
"wheel",
"docker"
]
}
}
},
{
"name": "org.osbuild.locale",
"options": {
"language": "en_US.UTF-8"
}
},
{
"name": "org.osbuild.fstab",
"options": {
"filesystems": [
{
"label": "boot",
"vfs_type": "ext4",
"path": "/boot",
"freq": 1,
"passno": 1
},
{
"label": "root",
"vfs_type": "ext4",
"path": "/",
"freq": 1,
"passno": 1
},
{
"label": "EFI-SYSTEM",
"vfs_type": "vfat",
"path": "/boot/efi",
"options": "umask=0077,shortname=winnt",
"freq": 0,
"passno": 2
]
},
{
"name": "ostree-commit",
"build": "name:build",
"stages": [
{
"type": "org.osbuild.ostree.init",
"options": {
"path": "/repo"
}
},
{
"type": "org.osbuild.ostree.commit",
"inputs": {
"tree": {
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:ostree-tree"
]
}
]
},
"options": {
"ref": "fedora/x86_64/osbuild",
"os_version": "34"
}
}
},
{
"name": "org.osbuild.selinux",
"options": {
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
}
},
{
"name": "org.osbuild.rpm-ostree",
"options": {
"etc_group_members": [
"wheel",
"docker"
]
}
}
],
"assembler": {
"name": "org.osbuild.ostree.commit",
"options": {
"ref": "fedora/x86_64/osbuild",
"os_version": "34"
}
]
}
}
]
}

16
test/run/test_assemblers.py
View file

@ -118,9 +118,9 @@ class TestAssemblers(test.TestBase):
data = json.dumps(manifest)
with tempfile.TemporaryDirectory(dir="/var/tmp") as output_dir:
result = osb.compile(data, output_dir=output_dir, exports=["assembler"])
compose_file = os.path.join(output_dir, "assembler", "compose.json")
repo = os.path.join(output_dir, "assembler", "repo")
result = osb.compile(data, output_dir=output_dir, exports=["ostree-commit"])
compose_file = os.path.join(output_dir, "ostree-commit", "compose.json")
repo = os.path.join(output_dir, "ostree-commit", "repo")
with open(compose_file) as f:
compose = json.load(f)
@ -132,10 +132,12 @@ class TestAssemblers(test.TestBase):
assert ref
assert rpmostree_inputhash
assert os_version
self.assertIn("metadata", result["assembler"])
metadata = result["assembler"]["metadata"]
self.assertIn("compose", metadata)
self.assertEqual(compose, metadata["compose"])
self.assertIn("metadata", result)
metadata = result["metadata"]
commit = metadata["ostree-commit"]
info = commit["org.osbuild.ostree.commit"]
self.assertIn("compose", info)
self.assertEqual(compose, info["compose"])
md = subprocess.check_output(
[