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

test/manifests: base ostree image on commit

Browse source 
Instead of re-defining the ostree-commit in the ostree-image.mpp
file, import the needed pipelines to build the commit and use
that.
This commit is contained in:
Christian Kellner 2022-08-10 16:30:14 +02:00 • committed by Tom Gundersen
parent d2bcaffbdc
commit 10255dbdcc
2 changed files with 641 additions and 848 deletions
Download patch file Download diff file Expand all files Collapse all files

1268
test/data/manifests/fedora-ostree-image.json
View file

File diff suppressed because it is too large Load diff

221
test/data/manifests/fedora-ostree-image.mpp.json
View file

@ -1,4 +1,11 @@
{
"mpp-vars": {
"arch": "x86_64",
"release": 34,
"releasever": "f$release",
"snapshot": "20210512",
"updates": "20220801"
},
"version": "2",
"mpp-define-image": {
"id": "image",
@ -37,213 +44,21 @@
"pipelines": [
{
"mpp-import-pipeline": {
"path": "f34-build-v2.json",
"path": "fedora-build-v2.mpp.json",
"id": "build"
},
"runner": "org.osbuild.fedora34"
"runner": {
"mpp-format-string": "org.osbuild.fedora{release}"
}
},
{
"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": [
"fedora-release-iot",
"glibc",
"glibc-minimal-langpack",
"nss-altfiles",
"sssd-client",
"libsss_sudo",
"shadow-utils",
"kernel",
"dracut-config-generic",
"dracut-network",
"rpm-ostree",
"polkit",
"lvm2",
"cryptsetup",
"pinentry",
"keyutils",
"cracklib-dicts",
"e2fsprogs",
"xfsprogs",
"dosfstools",
"gnupg2",
"basesystem",
"python3",
"bash",
"xz",
"gzip",
"coreutils",
"which",
"curl",
"firewalld",
"iptables",
"NetworkManager",
"NetworkManager-wifi",
"NetworkManager-wwan",
"wpa_supplicant",
"wireless-regdb",
"iwd",
"tpm2-pkcs11",
"dnsmasq",
"traceroute",
"hostname",
"iproute",
"iputils",
"openssh-clients",
"openssh-server",
"passwd",
"policycoreutils",
"procps-ng",
"rootfiles",
"rpm",
"selinux-policy-targeted",
"setup",
"shadow-utils",
"sudo",
"systemd",
"util-linux",
"vim-minimal",
"less",
"tar",
"greenboot",
"greenboot-grub2",
"greenboot-rpm-ostree-grub2",
"greenboot-reboot",
"greenboot-status",
"ignition",
"zram-generator",
"zram-generator-defaults",
"rsync",
"attr",
"ima-evm-utils",
"openssl",
"bash-completion",
"tmux",
"screen",
"policycoreutils-python-utils",
"setools-console",
"usbguard",
"audit",
"rng-tools",
"chrony",
"bluez",
"bluez-libs",
"bluez-mesh",
"kernel-tools",
"libgpiod-utils",
"podman",
"podman-plugins",
"container-selinux",
"skopeo",
"criu",
"slirp4netns",
"fuse-overlayfs",
"grub2",
"grub2-efi-x64",
"efibootmgr",
"shim-x64",
"microcode_ctl",
"cloud-init"
],
"excludes": [
"dracut-config-rescue"
]
}
}
}
},
{
"type": "org.osbuild.locale",
"options": {
"language": "en_US.UTF-8"
}
},
{
"type": "org.osbuild.systemd",
"options": {
"enabled_services": [
"NetworkManager.service",
"cloud-config",
"cloud-final",
"cloud-init",
"cloud-init-local",
"firewalld.service",
"rngd.service",
"sshd.service",
"greenboot-grub2-set-counter.service",
"greenboot-grub2-set-success.service",
"greenboot-healthcheck.service",
"greenboot-rpm-ostree-grub2-check-fallback.service",
"greenboot-status.service",
"greenboot-task-runner.service"
]
}
},
{
"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": "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"
}
}
]
"mpp-import-pipelines": {
"path": "fedora-ostree-commit.mpp.json",
"ids": [
"ostree-tree",
"ostree-commit"
]
}
},
{
"name": "image-tree",