From f777eb5ac2ed1104c5004a2a73cfa3d7edbd5b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Thu, 27 Jul 2023 19:32:09 +0200 Subject: [PATCH] convert all mpp.yaml files to proper YAML This is the second step of the conversion. All mpp.yaml json files were loaded and dumped again with pyyaml. It was tweaked to keep the order of keys and to save multi-line strings in the "flow" style. This was done, so the GPG keys are kept on one line. Otherwise, they take up too much visual space. There is no functional change in this commit. --- test/data/manifests/arch/arch-build.mpp.yaml | 614 +++---- .../arch/arch-vagrant-libvirt.mpp.yaml | 767 ++++----- .../manifests/centos-stream-build.mpp.yaml | 169 +- .../data/manifests/centos-stream-uki.mpp.yaml | 412 ++--- test/data/manifests/f34-base.mpp.yaml | 57 +- test/data/manifests/f34-build-v2.mpp.yaml | 156 +- test/data/manifests/f34-build.mpp.yaml | 85 +- test/data/manifests/fedora-boot.mpp.yaml | 183 +-- test/data/manifests/fedora-build-v2.mpp.yaml | 187 +-- test/data/manifests/fedora-build.mpp.yaml | 85 +- test/data/manifests/fedora-container.mpp.yaml | 201 +-- .../fedora-ostree-bootiso-xz.mpp.yaml | 1443 +++++++---------- .../manifests/fedora-ostree-bootiso.mpp.yaml | 1438 +++++++--------- .../manifests/fedora-ostree-commit.mpp.yaml | 277 ++-- .../fedora-ostree-container.mpp.yaml | 401 ++--- .../manifests/fedora-ostree-image.mpp.yaml | 917 ++++------- .../fedora-ostree-native-container.mpp.yaml | 83 +- .../manifests/fedora-ostree-tarball.mpp.yaml | 257 ++- test/data/manifests/fedora-uki.mpp.yaml | 428 ++--- test/data/manifests/filesystem.mpp.yaml | 62 +- test/data/manifests/rhel/el7-build.mpp.yaml | 112 +- test/data/manifests/rhel/el7-qcow2.mpp.yaml | 924 +++++------ test/data/stages/authconfig/a.mpp.yaml | 53 +- test/data/stages/authconfig/b.mpp.yaml | 57 +- test/data/stages/authselect/a.mpp.yaml | 53 +- test/data/stages/authselect/b.mpp.yaml | 69 +- test/data/stages/chmod/a.mpp.yaml | 74 +- test/data/stages/chmod/b.mpp.yaml | 89 +- test/data/stages/chown/a.mpp.yaml | 197 +-- test/data/stages/chown/b.mpp.yaml | 241 +-- test/data/stages/chrony-servers/a.mpp.yaml | 53 +- test/data/stages/chrony-servers/b.mpp.yaml | 85 +- test/data/stages/chrony/a.mpp.yaml | 53 +- test/data/stages/chrony/b.mpp.yaml | 67 +- test/data/stages/cloud-init/a.mpp.yaml | 53 +- test/data/stages/cloud-init/b.mpp.yaml | 138 +- .../stages/containers.storage.conf/a.mpp.yaml | 64 +- .../stages/containers.storage.conf/b.mpp.yaml | 99 +- test/data/stages/copy/a.mpp.yaml | 133 +- test/data/stages/copy/b.mpp.yaml | 147 +- test/data/stages/cpio.out/a.mpp.yaml | 31 +- test/data/stages/cpio.out/b.mpp.yaml | 187 +-- test/data/stages/cron.script/a.mpp.yaml | 85 +- test/data/stages/cron.script/b.mpp.yaml | 87 +- .../stages/dnf-automatic.config/a.mpp.yaml | 53 +- .../stages/dnf-automatic.config/b.mpp.yaml | 70 +- test/data/stages/dnf.config/a.mpp.yaml | 53 +- test/data/stages/dnf.config/b.mpp.yaml | 82 +- test/data/stages/dracut.conf/a.mpp.yaml | 53 +- test/data/stages/dracut.conf/b.mpp.yaml | 70 +- test/data/stages/dracut/template.mpp.yaml | 69 +- test/data/stages/fdo/a.mpp.yaml | 31 +- test/data/stages/fdo/b.mpp.yaml | 62 +- test/data/stages/firewall/a.mpp.yaml | 53 +- test/data/stages/firewall/b.mpp.yaml | 107 +- test/data/stages/fstab/a.mpp.yaml | 53 +- test/data/stages/fstab/b.mpp.yaml | 111 +- .../stages/gcp.guest-agent.conf/a.mpp.yaml | 53 +- .../stages/gcp.guest-agent.conf/b.mpp.yaml | 86 +- test/data/stages/groups/a.mpp.yaml | 53 +- test/data/stages/groups/b.mpp.yaml | 68 +- test/data/stages/grub2.legacy/a.mpp.yaml | 31 +- test/data/stages/grub2.legacy/b.mpp.yaml | 92 +- test/data/stages/grub2/a.mpp.yaml | 31 +- test/data/stages/grub2/b.mpp.yaml | 73 +- test/data/stages/gunzip/a.mpp.yaml | 67 +- test/data/stages/gunzip/b.mpp.yaml | 103 +- test/data/stages/gzip/a.mpp.yaml | 31 +- test/data/stages/gzip/b.mpp.yaml | 67 +- test/data/stages/hostname/a.mpp.yaml | 53 +- test/data/stages/hostname/b.mpp.yaml | 62 +- test/data/stages/kernel-cmdline/a.mpp.yaml | 55 +- test/data/stages/kernel-cmdline/b.mpp.yaml | 66 +- test/data/stages/keymap/a.mpp.yaml | 53 +- test/data/stages/keymap/b.mpp.yaml | 72 +- test/data/stages/livesys/a.mpp.yaml | 53 +- test/data/stages/livesys/b.mpp.yaml | 62 +- test/data/stages/locale/a.mpp.yaml | 53 +- test/data/stages/locale/b.mpp.yaml | 62 +- test/data/stages/mkdir/a.mpp.yaml | 47 +- test/data/stages/mkdir/b.mpp.yaml | 67 +- test/data/stages/modprobe/a.mpp.yaml | 51 +- test/data/stages/modprobe/b.mpp.yaml | 115 +- test/data/stages/nginx.conf/a.mpp.yaml | 62 +- test/data/stages/nginx.conf/b.mpp.yaml | 82 +- test/data/stages/nm.conf/a.mpp.yaml | 22 +- test/data/stages/nm.conf/b.mpp.yaml | 90 +- test/data/stages/nm.conn/a.mpp.yaml | 22 +- test/data/stages/nm.conn/b.mpp.yaml | 102 +- test/data/stages/oscap.autotailor/a.mpp.yaml | 31 +- test/data/stages/oscap.autotailor/b.mpp.yaml | 73 +- test/data/stages/oscap.remediation/a.mpp.yaml | 66 +- test/data/stages/oscap.remediation/b.mpp.yaml | 82 +- test/data/stages/ovf/ovf.mpp.yaml | 90 +- test/data/stages/pam.limits.conf/a.mpp.yaml | 53 +- test/data/stages/pam.limits.conf/b.mpp.yaml | 145 +- test/data/stages/parted/parted.mpp.yaml | 101 +- test/data/stages/pwquality.conf/a.mpp.yaml | 57 +- test/data/stages/pwquality.conf/b.mpp.yaml | 85 +- test/data/stages/qemu/qemu.mpp.yaml | 372 ++--- test/data/stages/resolv-conf/a.mpp.yaml | 22 +- test/data/stages/resolv-conf/b.mpp.yaml | 35 +- test/data/stages/rhsm.facts/a.mpp.yaml | 118 +- test/data/stages/rhsm.facts/b.mpp.yaml | 132 +- test/data/stages/rhsm/a.mpp.yaml | 53 +- test/data/stages/rhsm/b.mpp.yaml | 86 +- test/data/stages/rpm.macros/a.mpp.yaml | 31 +- test/data/stages/rpm.macros/b.mpp.yaml | 44 +- test/data/stages/rpm/b.mpp.yaml | 53 +- test/data/stages/rpmkeys.import/a.mpp.yaml | 31 +- test/data/stages/rpmkeys.import/b.mpp.yaml | 53 +- test/data/stages/selinux.config/a.mpp.yaml | 53 +- test/data/stages/selinux.config/b.mpp.yaml | 64 +- test/data/stages/sfdisk/sfdisk.mpp.yaml | 117 +- test/data/stages/sgdisk/sgdisk.mpp.yaml | 117 +- test/data/stages/shell.init/a.mpp.yaml | 86 +- test/data/stages/shell.init/b.mpp.yaml | 126 +- test/data/stages/skopeo/a.mpp.yaml | 142 +- test/data/stages/skopeo/b.mpp.yaml | 31 +- test/data/stages/sshd.config/a.mpp.yaml | 53 +- test/data/stages/sshd.config/b.mpp.yaml | 89 +- test/data/stages/sysconfig/a.mpp.yaml | 39 +- test/data/stages/sysconfig/b.mpp.yaml | 91 +- test/data/stages/sysctld/a.mpp.yaml | 53 +- test/data/stages/sysctld/b.mpp.yaml | 99 +- test/data/stages/systemd-journald/a.mpp.yaml | 64 +- test/data/stages/systemd-journald/b.mpp.yaml | 87 +- test/data/stages/systemd-logind/a.mpp.yaml | 53 +- test/data/stages/systemd-logind/b.mpp.yaml | 72 +- test/data/stages/systemd.preset/a.mpp.yaml | 57 +- test/data/stages/systemd.preset/b.mpp.yaml | 73 +- test/data/stages/systemd.unit/a.mpp.yaml | 57 +- test/data/stages/systemd.unit/b.mpp.yaml | 76 +- test/data/stages/systemd/a.mpp.yaml | 57 +- test/data/stages/systemd/b.mpp.yaml | 79 +- test/data/stages/tar/tar.mpp.yaml | 105 +- test/data/stages/timezone/a.mpp.yaml | 53 +- test/data/stages/timezone/b.mpp.yaml | 62 +- test/data/stages/tmpfilesd/a.mpp.yaml | 53 +- test/data/stages/tmpfilesd/b.mpp.yaml | 135 +- test/data/stages/tuned/a.mpp.yaml | 55 +- test/data/stages/tuned/b.mpp.yaml | 67 +- test/data/stages/udev.rules/a.mpp.yaml | 64 +- test/data/stages/udev.rules/b.mpp.yaml | 165 +- test/data/stages/untar/a.mpp.yaml | 31 +- test/data/stages/untar/b.mpp.yaml | 105 +- test/data/stages/users/a.mpp.yaml | 55 +- test/data/stages/users/b.mpp.yaml | 106 +- test/data/stages/waagent.conf/a.mpp.yaml | 57 +- test/data/stages/waagent.conf/b.mpp.yaml | 79 +- test/data/stages/wsl.conf/a.mpp.yaml | 64 +- test/data/stages/wsl.conf/b.mpp.yaml | 76 +- test/data/stages/xz/a.mpp.yaml | 31 +- test/data/stages/xz/b.mpp.yaml | 60 +- test/data/stages/yum.config/a.mpp.yaml | 53 +- test/data/stages/yum.config/b.mpp.yaml | 76 +- test/data/stages/yum.repos/a.mpp.yaml | 53 +- test/data/stages/yum.repos/b.mpp.yaml | 152 +- test/data/stages/zipl/a.mpp.yaml | 53 +- test/data/stages/zipl/b.mpp.yaml | 62 +- test/data/stages/zstd/a.mpp.yaml | 64 +- test/data/stages/zstd/b.mpp.yaml | 95 +- 162 files changed, 7549 insertions(+), 12376 deletions(-) diff --git a/test/data/manifests/arch/arch-build.mpp.yaml b/test/data/manifests/arch/arch-build.mpp.yaml index ace5a45a..3310446d 100644 --- a/test/data/manifests/arch/arch-build.mpp.yaml +++ b/test/data/manifests/arch/arch-build.mpp.yaml @@ -1,373 +1,241 @@ -{ - "version": "2", - "pipelines": [ - { - "name": "build", - "runner": "org.osbuild.arch", - "stages": [ - { - "type": "org.osbuild.pacman.conf" - }, - { - "type": "org.osbuild.pacman", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "solver": "alpm", - "repos": [ - { - "id": "core", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - }, - { - "id": "community", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - }, - { - "id": "extra", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - } - ], - "packages": [ - "pacman", - "btrfs-progs", - "dosfstools", - "e2fsprogs", - "qemu", - "systemd", - "tar", - "xfsprogs", - "xz", - "python", - "pyalpm", - "grub", - "mkinitcpio" - ] - } - } - }, - "options": {} - } - ] - }, - { - "name": "os", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.pacman.conf", - "options": { - "repositories": [ - {"name": "core", "include": "/etc/pacman.d/mirrorlist"}, - {"name": "extra", "include": "/etc/pacman.d/mirrorlist"}, - {"name": "community", "include": "/etc/pacman.d/mirrorlist"} - ] - } - }, - { - "type": "org.osbuild.pacman.mirrorlist.conf", - "options": { - "mirrors": ["https://europe.mirror.pkgbuild.com/$repo/os/$arch"] - } - }, - { - "type": "org.osbuild.pacman", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "solver": "alpm", - "repos": [ - { - "id": "core", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - }, - { - "id": "community", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - }, - { - "id": "extra", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - } - ], - "packages": [ - "base", - "bash", - "pacman", - "btrfs-progs", - "dosfstools", - "e2fsprogs", - "systemd", - "linux", - "mkinitcpio", - "networkmanager", - "sudo", - "rsync", - "tar", - "grub", - "openssh" - ] - } - } - }, - "options": {} - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "arch": { - "password": "$6$.Pkz378k0geWPWsH$IhFEP1WmQUEkmfMLbf14C./LUYJqsKBVXsNZ2mrOAcKY4wjMN8e/r8TwQmqpm/xPIpfPq1l0PpKD7YQyVHvuD/", - "home": "/home/arch" - } - } - } - }, - { - "type": "org.osbuild.fstab", - "options": { - "filesystems": [ - { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", - "path": "/", - "options": "defaults" - }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", - "path": "/boot/efi", - "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt", - "passno": 2 - } - ] - } - }, - { - "type": "org.osbuild.grub2.legacy", - "options": { - "architecture": "x64", - "rootfs": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" - }, - "bios": "i386-pc", - "entries": [ - { - "id": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "default": true, - "product": { - "name": "Arch Linux", - "version": "latest", - "nick": "Arch" - }, - "kernel": "linux" - } - ], - "config": { - "cmdline": "ro crashkernel=auto console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300 scsi_mod.use_blk_mq=y enforcing=0", - "distributor": "$(sed 's, release .*$,,g' /etc/system-release)", - "serial": "serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1", - "terminal_input": [ - "serial", - "console" - ], - "terminal_output": [ - "serial", - "console" - ] - } - } - }, - { - "type": "org.osbuild.mkinitcpio" - }, - { - "type": "org.osbuild.pacman-keyring" - } - ] - }, - { - "name": "root-tar", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.tar", - "options": { - "filename": "arch.tar.zst" - }, - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:os" - ] - } - } - } - ] - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": "10737418240" - } - }, - { - "type": "org.osbuild.sfdisk", - "options": { - "label": "gpt", - "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0", - "partitions": [ - { - "bootable": true, - "size": 2048, - "start": 2048, - "type": "21686148-6449-6E6F-744E-656564454649", - "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" - }, - { - "size": 204800, - "start": 4096, - "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" - }, - { - "size": 20762524, - "start": 208896, - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" - } - ] - }, - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - } - }, - { - "type": "org.osbuild.mkfs.fat", - "options": { - "volid": "7B7795E7" - }, - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 4096, - "size": 204800 - } - } - } - }, - { - "type": "org.osbuild.mkfs.xfs", - "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "label": "root" - }, - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 208896, - "size": 20762524 - } - } - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "root-tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:os" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://root-tree/", - "to": "mount://root/" - } - ] - }, - "devices": { - "efi": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 4096, - "size": 204800 - } - }, - "root": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 208896, - "size": 20762524 - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.xfs", - "source": "root", - "target": "/" - }, - { - "name": "efi", - "type": "org.osbuild.fat", - "source": "efi", - "target": "/boot/efi" - } - ] - }, - { - "type": "org.osbuild.grub2.inst", - "options": { - "filename": "disk.img", - "platform": "i386-pc", - "location": 2048, - "core": { - "type": "mkimage", - "partlabel": "gpt", - "filesystem": "xfs", - "binary": "grub-mkimage" - }, - "prefix": { - "type": "partition", - "partlabel": "gpt", - "number": 2, - "path": "/boot/grub2" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - name: build + runner: org.osbuild.arch + stages: + - type: org.osbuild.pacman.conf + - type: org.osbuild.pacman + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + solver: alpm + repos: + - id: core + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + - id: community + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + - id: extra + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + packages: + - pacman + - btrfs-progs + - dosfstools + - e2fsprogs + - qemu + - systemd + - tar + - xfsprogs + - xz + - python + - pyalpm + - grub + - mkinitcpio + options: {} + - name: os + build: name:build + stages: + - type: org.osbuild.pacman.conf + options: + repositories: + - name: core + include: /etc/pacman.d/mirrorlist + - name: extra + include: /etc/pacman.d/mirrorlist + - name: community + include: /etc/pacman.d/mirrorlist + - type: org.osbuild.pacman.mirrorlist.conf + options: + mirrors: + - https://europe.mirror.pkgbuild.com/$repo/os/$arch + - type: org.osbuild.pacman + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + solver: alpm + repos: + - id: core + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + - id: community + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + - id: extra + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + packages: + - base + - bash + - pacman + - btrfs-progs + - dosfstools + - e2fsprogs + - systemd + - linux + - mkinitcpio + - networkmanager + - sudo + - rsync + - tar + - grub + - openssh + options: {} + - type: org.osbuild.users + options: + users: + arch: + password: $6$.Pkz378k0geWPWsH$IhFEP1WmQUEkmfMLbf14C./LUYJqsKBVXsNZ2mrOAcKY4wjMN8e/r8TwQmqpm/xPIpfPq1l0PpKD7YQyVHvuD/ + home: /home/arch + - type: org.osbuild.fstab + options: + filesystems: + - uuid: 0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 + vfs_type: xfs + path: / + options: defaults + - uuid: 7B77-95E7 + vfs_type: vfat + path: /boot/efi + options: defaults,uid=0,gid=0,umask=077,shortname=winnt + passno: 2 + - type: org.osbuild.grub2.legacy + options: + architecture: x64 + rootfs: + uuid: 0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 + bios: i386-pc + entries: + - id: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + default: true + product: + name: Arch Linux + version: latest + nick: Arch + kernel: linux + config: + cmdline: ro crashkernel=auto console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300 scsi_mod.use_blk_mq=y enforcing=0 + distributor: $(sed 's, release .*$,,g' /etc/system-release) + serial: serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 + terminal_input: + - serial + - console + terminal_output: + - serial + - console + - type: org.osbuild.mkinitcpio + - type: org.osbuild.pacman-keyring + - name: root-tar + build: name:build + stages: + - type: org.osbuild.tar + options: + filename: arch.tar.zst + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:os + - name: image + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: '10737418240' + - type: org.osbuild.sfdisk + options: + label: gpt + uuid: D209C89E-EA5E-4FBD-B161-B461CCE297E0 + partitions: + - bootable: true + size: 2048 + start: 2048 + type: 21686148-6449-6E6F-744E-656564454649 + uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549 + - size: 204800 + start: 4096 + type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B + uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33 + - size: 20762524 + start: 208896 + type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + uuid: 6264D520-3FB9-423F-8AB8-7A0A8E3D3562 + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + - type: org.osbuild.mkfs.fat + options: + volid: 7B7795E7 + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: 4096 + size: 204800 + - type: org.osbuild.mkfs.xfs + options: + uuid: 0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 + label: root + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: 208896 + size: 20762524 + - type: org.osbuild.copy + inputs: + root-tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:os + options: + paths: + - from: input://root-tree/ + to: mount://root/ + devices: + efi: + type: org.osbuild.loopback + options: + filename: disk.img + start: 4096 + size: 204800 + root: + type: org.osbuild.loopback + options: + filename: disk.img + start: 208896 + size: 20762524 + mounts: + - name: root + type: org.osbuild.xfs + source: root + target: / + - name: efi + type: org.osbuild.fat + source: efi + target: /boot/efi + - type: org.osbuild.grub2.inst + options: + filename: disk.img + platform: i386-pc + location: 2048 + core: + type: mkimage + partlabel: gpt + filesystem: xfs + binary: grub-mkimage + prefix: + type: partition + partlabel: gpt + number: 2 + path: /boot/grub2 diff --git a/test/data/manifests/arch/arch-vagrant-libvirt.mpp.yaml b/test/data/manifests/arch/arch-vagrant-libvirt.mpp.yaml index 6a1a1643..82327e00 100644 --- a/test/data/manifests/arch/arch-vagrant-libvirt.mpp.yaml +++ b/test/data/manifests/arch/arch-vagrant-libvirt.mpp.yaml @@ -1,473 +1,294 @@ -{ - "version": "2", - "pipelines": [ - { - "name": "build", - "runner": "org.osbuild.arch", - "stages": [ - { - "type": "org.osbuild.pacman.conf" - }, - { - "type": "org.osbuild.pacman", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "solver": "alpm", - "repos": [ - { - "id": "core", - "baseurl": "https://archive.archlinux.org/repos/2022/04/14/$repo/os/$arch" - }, - { - "id": "community", - "baseurl": "https://archive.archlinux.org/repos/2022/04/14/$repo/os/$arch" - }, - { - "id": "extra", - "baseurl": "https://archive.archlinux.org/repos/2022/04/14/$repo/os/$arch" - } - ], - "packages": [ - "pacman", - "btrfs-progs", - "dosfstools", - "e2fsprogs", - "qemu", - "systemd", - "tar", - "xfsprogs", - "xz", - "python", - "pyalpm", - "grub", - "mkinitcpio" - ] - } - } - }, - "options": {} - } - ] - }, - { - "name": "os", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.pacman.conf", - "options": { - "repositories": [ - { - "name": "core", - "include": "/etc/pacman.d/mirrorlist" - }, - { - "name": "extra", - "include": "/etc/pacman.d/mirrorlist" - }, - { - "name": "community", - "include": "/etc/pacman.d/mirrorlist" - } - ] - } - }, - { - "type": "org.osbuild.pacman.mirrorlist.conf", - "options": { - "mirrors": [ - "https://europe.mirror.pkgbuild.com/$repo/os/$arch" - ] - } - }, - { - "type": "org.osbuild.pacman", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "solver": "alpm", - "repos": [ - { - "id": "core", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - }, - { - "id": "community", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - }, - { - "id": "extra", - "baseurl": "https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch" - } - ], - "packages": [ - "base", - "bash", - "pacman", - "btrfs-progs", - "dosfstools", - "e2fsprogs", - "systemd", - "linux", - "mkinitcpio", - "tar", - "grub", - "openssh", - "sudo", - "nfs-utils", - "ntp", - "virtualbox-guest-utils-nox", - "polkit", - "networkmanager", - "rsync" - ] - } - } - }, - "options": {} - }, - { - "type": "org.osbuild.pacman-keyring" - }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "vboxservice.service", - "sshd.service", - "NetworkManager.service" - ] - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "vagrant": { - "password": "$6$8dbFyte9oE3ugPHO$q0cTMv1oAgK/ZVXUTSUqj1aXzrhniNqfylqbcW.LgElYRJNRGSr4hBE7hghu2oP1nKn68u13/YmDkKH.s6yil0", - "home": "/home/vagrant", - "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" - } - } - } - }, - { - "type": "org.osbuild.fstab", - "options": { - "filesystems": [ - { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", - "path": "/", - "options": "defaults" - }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", - "path": "/boot/efi", - "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt", - "passno": 2 - } - ] - } - }, - { - "type": "org.osbuild.grub2.legacy", - "options": { - "rootfs": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" - }, - "bios": { - "platform": "i386-pc" - }, - "entries": [ - { - "id": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "default": true, - "product": { - "name": "Arch Linux", - "version": "latest", - "nick": "Arch" - }, - "kernel": "linux" - } - ], - "config": { - "cmdline": "ro crashkernel=auto console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300 scsi_mod.use_blk_mq=y enforcing=0", - "distributor": "$(sed 's, release .*$,,g' /etc/system-release)", - "serial": "serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1", - "terminal_input": [ - "serial", - "console" - ], - "terminal_output": [ - "serial", - "console" - ] - } - } - }, - { - "type": "org.osbuild.mkinitcpio" - }, - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "vagrant-sudoers", - "text": "Defaults:vagrant !requiretty\nvagrant ALL=(ALL) NOPASSWD: ALL" - } - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://inlinefile/{embedded['vagrant-sudoers']}" - }, - "to": "tree:////etc/sudoers.d/vagrant" - } - ] - } - } - ] - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": "10737418240" - } - }, - { - "type": "org.osbuild.sfdisk", - "options": { - "label": "gpt", - "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0", - "partitions": [ - { - "bootable": true, - "size": 2048, - "start": 2048, - "type": "21686148-6449-6E6F-744E-656564454649", - "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" - }, - { - "size": 204800, - "start": 4096, - "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" - }, - { - "size": 20762524, - "start": 208896, - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" - } - ] - }, - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - } - }, - { - "type": "org.osbuild.mkfs.fat", - "options": { - "volid": "7B7795E7" - }, - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 4096, - "size": 204800 - } - } - } - }, - { - "type": "org.osbuild.mkfs.xfs", - "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "label": "root" - }, - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 208896, - "size": 20762524 - } - } - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "root-tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:os" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://root-tree/", - "to": "mount://root/" - } - ] - }, - "devices": { - "efi": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 4096, - "size": 204800 - } - }, - "root": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": 208896, - "size": 20762524 - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.xfs", - "source": "root", - "target": "/" - }, - { - "name": "efi", - "type": "org.osbuild.fat", - "source": "efi", - "target": "/boot/efi" - } - ] - }, - { - "type": "org.osbuild.grub2.inst", - "options": { - "filename": "disk.img", - "platform": "i386-pc", - "location": 2048, - "core": { - "type": "mkimage", - "partlabel": "gpt", - "filesystem": "xfs", - "binary": "grub-mkimage" - }, - "prefix": { - "type": "partition", - "partlabel": "gpt", - "number": 2, - "path": "/boot/grub2" - } - } - } - ] - }, - { - "name": "qcow2", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "disk.img" - } - } - } - }, - "options": { - "filename": "disk.qcow2", - "format": { - "type": "qcow2", - "compat": "1.1" - } - } - } - ] - }, - { - "name": "vagrant", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.vagrant", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:qcow2": { - "file": "disk.qcow2" - } - } - } - }, - "options": { - "provider": "libvirt" - } - } - ] - }, - { - "name": "vagrant-libvirt", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.tar", - "options": { - "filename": "vagrant-libvirt.box" - }, - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:vagrant" - ] - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - name: build + runner: org.osbuild.arch + stages: + - type: org.osbuild.pacman.conf + - type: org.osbuild.pacman + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + solver: alpm + repos: + - id: core + baseurl: https://archive.archlinux.org/repos/2022/04/14/$repo/os/$arch + - id: community + baseurl: https://archive.archlinux.org/repos/2022/04/14/$repo/os/$arch + - id: extra + baseurl: https://archive.archlinux.org/repos/2022/04/14/$repo/os/$arch + packages: + - pacman + - btrfs-progs + - dosfstools + - e2fsprogs + - qemu + - systemd + - tar + - xfsprogs + - xz + - python + - pyalpm + - grub + - mkinitcpio + options: {} + - name: os + build: name:build + stages: + - type: org.osbuild.pacman.conf + options: + repositories: + - name: core + include: /etc/pacman.d/mirrorlist + - name: extra + include: /etc/pacman.d/mirrorlist + - name: community + include: /etc/pacman.d/mirrorlist + - type: org.osbuild.pacman.mirrorlist.conf + options: + mirrors: + - https://europe.mirror.pkgbuild.com/$repo/os/$arch + - type: org.osbuild.pacman + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + solver: alpm + repos: + - id: core + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + - id: community + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + - id: extra + baseurl: https://archive.archlinux.org/repos/2022/01/22/$repo/os/$arch + packages: + - base + - bash + - pacman + - btrfs-progs + - dosfstools + - e2fsprogs + - systemd + - linux + - mkinitcpio + - tar + - grub + - openssh + - sudo + - nfs-utils + - ntp + - virtualbox-guest-utils-nox + - polkit + - networkmanager + - rsync + options: {} + - type: org.osbuild.pacman-keyring + - type: org.osbuild.systemd + options: + enabled_services: + - vboxservice.service + - sshd.service + - NetworkManager.service + - type: org.osbuild.users + options: + users: + vagrant: + password: $6$8dbFyte9oE3ugPHO$q0cTMv1oAgK/ZVXUTSUqj1aXzrhniNqfylqbcW.LgElYRJNRGSr4hBE7hghu2oP1nKn68u13/YmDkKH.s6yil0 + home: /home/vagrant + key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key + - type: org.osbuild.fstab + options: + filesystems: + - uuid: 0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 + vfs_type: xfs + path: / + options: defaults + - uuid: 7B77-95E7 + vfs_type: vfat + path: /boot/efi + options: defaults,uid=0,gid=0,umask=077,shortname=winnt + passno: 2 + - type: org.osbuild.grub2.legacy + options: + rootfs: + uuid: 0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 + bios: + platform: i386-pc + entries: + - id: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + default: true + product: + name: Arch Linux + version: latest + nick: Arch + kernel: linux + config: + cmdline: ro crashkernel=auto console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300 scsi_mod.use_blk_mq=y enforcing=0 + distributor: $(sed 's, release .*$,,g' /etc/system-release) + serial: serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 + terminal_input: + - serial + - console + terminal_output: + - serial + - console + - type: org.osbuild.mkinitcpio + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: vagrant-sudoers + text: "Defaults:vagrant !requiretty\nvagrant ALL=(ALL) NOPASSWD: ALL" + options: + paths: + - from: + mpp-format-string: input://inlinefile/{embedded['vagrant-sudoers']} + to: tree:////etc/sudoers.d/vagrant + - name: image + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: '10737418240' + - type: org.osbuild.sfdisk + options: + label: gpt + uuid: D209C89E-EA5E-4FBD-B161-B461CCE297E0 + partitions: + - bootable: true + size: 2048 + start: 2048 + type: 21686148-6449-6E6F-744E-656564454649 + uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549 + - size: 204800 + start: 4096 + type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B + uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33 + - size: 20762524 + start: 208896 + type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + uuid: 6264D520-3FB9-423F-8AB8-7A0A8E3D3562 + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + - type: org.osbuild.mkfs.fat + options: + volid: 7B7795E7 + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: 4096 + size: 204800 + - type: org.osbuild.mkfs.xfs + options: + uuid: 0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 + label: root + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: 208896 + size: 20762524 + - type: org.osbuild.copy + inputs: + root-tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:os + options: + paths: + - from: input://root-tree/ + to: mount://root/ + devices: + efi: + type: org.osbuild.loopback + options: + filename: disk.img + start: 4096 + size: 204800 + root: + type: org.osbuild.loopback + options: + filename: disk.img + start: 208896 + size: 20762524 + mounts: + - name: root + type: org.osbuild.xfs + source: root + target: / + - name: efi + type: org.osbuild.fat + source: efi + target: /boot/efi + - type: org.osbuild.grub2.inst + options: + filename: disk.img + platform: i386-pc + location: 2048 + core: + type: mkimage + partlabel: gpt + filesystem: xfs + binary: grub-mkimage + prefix: + type: partition + partlabel: gpt + number: 2 + path: /boot/grub2 + - name: qcow2 + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: disk.img + options: + filename: disk.qcow2 + format: + type: qcow2 + compat: '1.1' + - name: vagrant + build: name:build + stages: + - type: org.osbuild.vagrant + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:qcow2: + file: disk.qcow2 + options: + provider: libvirt + - name: vagrant-libvirt + build: name:build + stages: + - type: org.osbuild.tar + options: + filename: vagrant-libvirt.box + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:vagrant diff --git a/test/data/manifests/centos-stream-build.mpp.yaml b/test/data/manifests/centos-stream-build.mpp.yaml index adaea5d3..688914bc 100644 --- a/test/data/manifests/centos-stream-build.mpp.yaml +++ b/test/data/manifests/centos-stream-build.mpp.yaml @@ -1,97 +1,72 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": "9", - "distribution": "cs$release", - "releasever": "el$release", - "snapshot": "20230202" - }, - "version": "2", - "pipelines": [ - { - "name": "build", - "source-epoch": 1659397331, - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-baseos-$snapshot/" - }, - { - "id": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-appstream-$snapshot/" - } - ], - "packages": [ - "binutils", - "cryptsetup", - "dnf", - "dosfstools", - "e2fsprogs", - "gdisk", - "grub2-pc", - "policycoreutils", - "python3-iniparse", - "python3-toml", - "qemu-img", - "rpm-ostree", - "systemd", - "tar", - "xfsprogs", - "xz", - "lvm2", - "selinux-policy-targeted", - "genisoimage", - "isomd5sum", - "xorriso", - "syslinux", - "skopeo", - "lorax-templates-generic", - "syslinux-nonlinux", - "squashfs-tools", - "grub2-pc-modules", - "grub2-tools", - "grub2-efi-x64", - "shim-x64", - "efibootmgr", - "grub2-tools-minimal", - "grub2-tools-extra", - "grub2-tools-efi", - "grub2-efi-x64", - "grub2-efi-x64-cdboot" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts", - "labels": { - "/usr/bin/cp": "system_u:object_r:install_exec_t:s0", - "/usr/bin/tar": "system_u:object_r:install_exec_t:s0" - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: '9' + distribution: cs$release + releasever: el$release + snapshot: '20230202' +version: '2' +pipelines: + - name: build + source-epoch: 1659397331 + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + repos: + - id: baseos + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-baseos-$snapshot/ + - id: appstream + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-appstream-$snapshot/ + packages: + - binutils + - cryptsetup + - dnf + - dosfstools + - e2fsprogs + - gdisk + - grub2-pc + - policycoreutils + - python3-iniparse + - python3-toml + - qemu-img + - rpm-ostree + - systemd + - tar + - xfsprogs + - xz + - lvm2 + - selinux-policy-targeted + - genisoimage + - isomd5sum + - xorriso + - syslinux + - skopeo + - lorax-templates-generic + - syslinux-nonlinux + - squashfs-tools + - grub2-pc-modules + - grub2-tools + - grub2-efi-x64 + - shim-x64 + - efibootmgr + - grub2-tools-minimal + - grub2-tools-extra + - grub2-tools-efi + - grub2-efi-x64 + - grub2-efi-x64-cdboot + 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" + exclude: + docs: true + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0 diff --git a/test/data/manifests/centos-stream-uki.mpp.yaml b/test/data/manifests/centos-stream-uki.mpp.yaml index 159c6685..5bad1899 100644 --- a/test/data/manifests/centos-stream-uki.mpp.yaml +++ b/test/data/manifests/centos-stream-uki.mpp.yaml @@ -1,250 +1,162 @@ -{ - "version": "2", - "mpp-vars": { - "arch": "x86_64", - "release": "9", - "distribution": "cs$release", - "releasever": "el$release", - "snapshot": "20230202" - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "centos-stream-build.mpp.yaml", - "id": "build" - }, - "runner": { - "mpp-format-string": "org.osbuild.centos{release}" - } - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "releasever": "$releasever", - "repos": [ - { - "id": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-baseos-$snapshot/" - }, - { - "id": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-appstream-$snapshot/" - } - ], - "packages": [ - "dnf", - "rpm-ostree", - "ostree", - "pigz", - "kernel", - "kernel-modules", - "kernel-modules-extra", - "glibc-all-langpacks", - "grub2-tools-efi", - "efibootmgr", - "shim-x64", - "grub2-efi-x64-cdboot", - "biosdevname", - "memtest86+", - "syslinux", - "grub2-tools", - "grub2-tools-minimal", - "grub2-tools-extra", - "dracut", - "anaconda-dracut", - "dracut-network", - "dracut-config-generic", - "initscripts", - "cryptsetup", - "rpcbind", - "kbd", - "kbd-misc", - "tar", - "xz", - "curl", - "bzip2", - "systemd-sysv", - "systemd-units", - "rsyslog", - "fcoe-utils", - "net-tools", - "nfs-utils" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - }, - "disable_dracut": true - } - }, - { - "type": "org.osbuild.dracut", - "options": { - "kernel": [ - { - "mpp-format-string": "{rpms['tree']['kernel'].evra}" - } - ], - "add_modules": [ - "convertfs", - "dmsquash-live", - "livenet", - "pollcdrom", - "qemu", - "qemu-net" - ] - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "root": { - "password": "" - } - } - } - } - ] - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.squashfs", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:tree" - ] - } - }, - "options": { - "filename": "rootfs.img", - "compression": { - "method": "gzip" - } - } - } - ] - }, - { - "name": "initrd", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.gunzip", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree": { - "file": { - "mpp-format-string": "/boot/initramfs-{rpms['tree']['kernel'].evra}.img" - } - } - } - } - }, - "options": { - "path": "initramfs.img" - } - }, - { - "type": "org.osbuild.cpio.out", - "options": { - "filename": "initramfs.img", - "append": true - }, - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:image" - ] - } - } - } - ] - }, - { - "name": "uki", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.uki", - "options": { - "filename": "linux.efi", - "kernel": { - "opts": [ - "root=live:/rootfs.img" - ] - } - }, - "inputs": { - "kernel": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree": { - "file": { - "mpp-format-string": "/boot/vmlinuz-{rpms['tree']['kernel'].evra}" - } - } - } - }, - "initrd": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:initrd": { - "file": { - "mpp-format-string": "/initramfs.img" - } - } - } - }, - "osrel": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree": { - "file": { - "mpp-format-string": "/etc/os-release" - } - } - } - } - } - } - ] - } - ] -} +version: '2' +mpp-vars: + arch: x86_64 + release: '9' + distribution: cs$release + releasever: el$release + snapshot: '20230202' +pipelines: + - mpp-import-pipeline: + path: centos-stream-build.mpp.yaml + id: build + runner: + mpp-format-string: org.osbuild.centos{release} + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + releasever: $releasever + repos: + - id: baseos + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-baseos-$snapshot/ + - id: appstream + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$distribution-$arch-appstream-$snapshot/ + packages: + - dnf + - rpm-ostree + - ostree + - pigz + - kernel + - kernel-modules + - kernel-modules-extra + - glibc-all-langpacks + - grub2-tools-efi + - efibootmgr + - shim-x64 + - grub2-efi-x64-cdboot + - biosdevname + - memtest86+ + - syslinux + - grub2-tools + - grub2-tools-minimal + - grub2-tools-extra + - dracut + - anaconda-dracut + - dracut-network + - dracut-config-generic + - initscripts + - cryptsetup + - rpcbind + - kbd + - kbd-misc + - tar + - xz + - curl + - bzip2 + - systemd-sysv + - systemd-units + - rsyslog + - fcoe-utils + - net-tools + - nfs-utils + 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" + exclude: + docs: true + disable_dracut: true + - type: org.osbuild.dracut + options: + kernel: + - mpp-format-string: '{rpms[''tree''][''kernel''].evra}' + add_modules: + - convertfs + - dmsquash-live + - livenet + - pollcdrom + - qemu + - qemu-net + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.users + options: + users: + root: + password: '' + - name: image + build: name:build + stages: + - type: org.osbuild.squashfs + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:tree + options: + filename: rootfs.img + compression: + method: gzip + - name: initrd + build: name:build + stages: + - type: org.osbuild.gunzip + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree: + file: + mpp-format-string: /boot/initramfs-{rpms['tree']['kernel'].evra}.img + options: + path: initramfs.img + - type: org.osbuild.cpio.out + options: + filename: initramfs.img + append: true + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:image + - name: uki + build: name:build + stages: + - type: org.osbuild.uki + options: + filename: linux.efi + kernel: + opts: + - root=live:/rootfs.img + inputs: + kernel: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree: + file: + mpp-format-string: /boot/vmlinuz-{rpms['tree']['kernel'].evra} + initrd: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:initrd: + file: + mpp-format-string: /initramfs.img + osrel: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree: + file: + mpp-format-string: /etc/os-release diff --git a/test/data/manifests/f34-base.mpp.yaml b/test/data/manifests/f34-base.mpp.yaml index 4aeb864c..c5e6bd06 100644 --- a/test/data/manifests/f34-base.mpp.yaml +++ b/test/data/manifests/f34-base.mpp.yaml @@ -1,36 +1,21 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "f34-build.json" - }, - "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/" - } - ], - "packages": [ - "@core", - "dracut-config-generic", - "grub2-pc", - "kernel" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: f34-build.json + 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/ + packages: + - '@core' + - dracut-config-generic + - grub2-pc + - kernel diff --git a/test/data/manifests/f34-build-v2.mpp.yaml b/test/data/manifests/f34-build-v2.mpp.yaml index 64c51c3e..3fe45885 100644 --- a/test/data/manifests/f34-build-v2.mpp.yaml +++ b/test/data/manifests/f34-build-v2.mpp.yaml @@ -1,89 +1,67 @@ -{ - "version": "2", - "pipelines": [ - { - "name": "build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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": [ - "btrfs-progs", - "cryptsetup", - "dnf", - "dosfstools", - "e2fsprogs", - "gdisk", - "grub2-pc", - "policycoreutils", - "python3-iniparse", - "python3-toml", - "qemu-img", - "rpm-ostree", - "systemd", - "tar", - "xfsprogs", - "xz", - "lvm2", - "selinux-policy-targeted", - "genisoimage", - "isomd5sum", - "xorriso", - "syslinux", - "skopeo", - "lorax-templates-generic", - "syslinux-nonlinux", - "squashfs-tools", - "grub2-pc-modules", - "grub2-tools", - "grub2-efi-x64", - "shim-x64", - "efibootmgr", - "grub2-tools-minimal", - "grub2-tools-extra", - "grub2-tools-efi", - "grub2-efi-x64", - "grub2-efi-x64-cdboot", - "shim-ia32", - "grub2-efi-ia32-cdboot", - "zstd", - "openscap-utils" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts", - "labels": { - "/usr/bin/cp": "system_u:object_r:install_exec_t:s0", - "/usr/bin/tar": "system_u:object_r:install_exec_t:s0" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - name: build + stages: + - type: org.osbuild.rpm + 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: + - btrfs-progs + - cryptsetup + - dnf + - dosfstools + - e2fsprogs + - gdisk + - grub2-pc + - policycoreutils + - python3-iniparse + - python3-toml + - qemu-img + - rpm-ostree + - systemd + - tar + - xfsprogs + - xz + - lvm2 + - selinux-policy-targeted + - genisoimage + - isomd5sum + - xorriso + - syslinux + - skopeo + - lorax-templates-generic + - syslinux-nonlinux + - squashfs-tools + - grub2-pc-modules + - grub2-tools + - grub2-efi-x64 + - shim-x64 + - efibootmgr + - grub2-tools-minimal + - grub2-tools-extra + - grub2-tools-efi + - grub2-efi-x64 + - grub2-efi-x64-cdboot + - shim-ia32 + - grub2-efi-ia32-cdboot + - zstd + - openscap-utils + 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" + exclude: + docs: true + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0 diff --git a/test/data/manifests/f34-build.mpp.yaml b/test/data/manifests/f34-build.mpp.yaml index 3cf79adc..5976d6a4 100644 --- a/test/data/manifests/f34-build.mpp.yaml +++ b/test/data/manifests/f34-build.mpp.yaml @@ -1,51 +1,34 @@ -{ - "pipeline": { - "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/" - } - ], - "packages": [ - "btrfs-progs", - "dnf", - "dosfstools", - "e2fsprogs", - "grub2-pc", - "policycoreutils", - "python3-iniparse", - "python3-pyyaml", - "qemu-img", - "rpm-ostree", - "selinux-policy-targeted", - "systemd", - "tar", - "xfsprogs", - "xz" - ] - } - } - }, - { - "name": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts", - "labels": { - "/usr/bin/cp": "system_u:object_r:install_exec_t:s0", - "/usr/bin/tar": "system_u:object_r:install_exec_t:s0" - } - } - } - ] - } -} +pipeline: + 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/ + packages: + - btrfs-progs + - dnf + - dosfstools + - e2fsprogs + - grub2-pc + - policycoreutils + - python3-iniparse + - python3-pyyaml + - qemu-img + - rpm-ostree + - selinux-policy-targeted + - systemd + - tar + - xfsprogs + - xz + - name: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0 diff --git a/test/data/manifests/fedora-boot.mpp.yaml b/test/data/manifests/fedora-boot.mpp.yaml index 4676907b..3952aae2 100644 --- a/test/data/manifests/fedora-boot.mpp.yaml +++ b/test/data/manifests/fedora-boot.mpp.yaml @@ -1,113 +1,70 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "fedora-build.mpp.yaml" - }, - "runner": { - "mpp-format-string": "org.osbuild.fedora{release}" - } - }, - "stages": [ - { - "name": "org.osbuild.kernel-cmdline", - "options": { - "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "kernel_opts": "ro biosdevname=0 net.ifnames=0" - } - }, - { - "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": "$arch", - "module-platform-id": "$releasever", - "releasever": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "@cloud-server-environment", - "chrony", - "dracut-config-generic", - "grub2-pc", - "kernel-core", - "langpacks-en", - "polkit", - "selinux-policy-targeted", - "systemd-udev" - ] - } - } - }, - { - "name": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "name": "org.osbuild.fstab", - "options": { - "filesystems": [ - { - "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "vfs_type": "ext4", - "path": "/", - "freq": 1, - "passno": 1 - } - ] - } - }, - { - "name": "org.osbuild.grub2", - "options": { - "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "legacy": "i386-pc", - "saved_entry": { - "mpp-format-string": "{'f'*32}-{rpms['stages']['kernel-core'].evra}" - }, - "write_cmdline": false - } - }, - { - "name": "org.osbuild.test", - "options": { - "script": "/usr/bin/systemctl is-system-running --wait" - } - }, - { - "name": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts" - } - }, - { - "name": "org.osbuild.fix-bls" - } - ], - "assembler": { - "name": "org.osbuild.qemu", - "options": { - "format": "qcow2", - "filename": "fedora-boot.qcow2", - "ptuuid": "0x1cd1d44b", - "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "size": 3221225472 - } - } - } -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +pipeline: + build: + mpp-import-pipeline: + path: fedora-build.mpp.yaml + runner: + mpp-format-string: org.osbuild.fedora{release} + stages: + - name: org.osbuild.kernel-cmdline + options: + root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + kernel_opts: ro biosdevname=0 net.ifnames=0 + - 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: $arch + module-platform-id: $releasever + releasever: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + packages: + - '@cloud-server-environment' + - chrony + - dracut-config-generic + - grub2-pc + - kernel-core + - langpacks-en + - polkit + - selinux-policy-targeted + - systemd-udev + - name: org.osbuild.locale + options: + language: en_US.UTF-8 + - name: org.osbuild.fstab + options: + filesystems: + - uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + vfs_type: ext4 + path: / + freq: 1 + passno: 1 + - name: org.osbuild.grub2 + options: + root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + legacy: i386-pc + saved_entry: + mpp-format-string: '{''f''*32}-{rpms[''stages''][''kernel-core''].evra}' + write_cmdline: false + - name: org.osbuild.test + options: + script: /usr/bin/systemctl is-system-running --wait + - name: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + - name: org.osbuild.fix-bls + assembler: + name: org.osbuild.qemu + options: + format: qcow2 + filename: fedora-boot.qcow2 + ptuuid: '0x1cd1d44b' + root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + size: 3221225472 diff --git a/test/data/manifests/fedora-build-v2.mpp.yaml b/test/data/manifests/fedora-build-v2.mpp.yaml index d61c818a..d02bc744 100644 --- a/test/data/manifests/fedora-build-v2.mpp.yaml +++ b/test/data/manifests/fedora-build-v2.mpp.yaml @@ -1,108 +1,79 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 36, - "releasever": "f$release", - "snapshot": "20220617", - "updates": "20220801" - }, - "version": "2", - "pipelines": [ - { - "name": "build", - "source-epoch": 1659397331, - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - }, - { - "id": "modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/" - }, - { - "id": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/" - }, - { - "id": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/" - } - ], - "packages": [ - "binutils", - "btrfs-progs", - "cryptsetup", - "dnf", - "dosfstools", - "e2fsprogs", - "gdisk", - "grub2-pc", - "policycoreutils", - "python3-iniparse", - "python3-toml", - "qemu-img", - "rpm-ostree", - "systemd", - "tar", - "xfsprogs", - "xz", - "lvm2", - "selinux-policy-targeted", - "genisoimage", - "isomd5sum", - "xorriso", - "syslinux", - "skopeo", - "lorax-templates-generic", - "syslinux-nonlinux", - "squashfs-tools", - "grub2-pc-modules", - "grub2-tools", - "grub2-efi-x64", - "shim-x64", - "efibootmgr", - "grub2-tools-minimal", - "grub2-tools-extra", - "grub2-tools-efi", - "grub2-efi-x64", - "grub2-efi-x64-cdboot", - "shim-ia32", - "grub2-efi-ia32-cdboot" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts", - "labels": { - "/usr/bin/cp": "system_u:object_r:install_exec_t:s0", - "/usr/bin/tar": "system_u:object_r:install_exec_t:s0" - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 36 + releasever: f$release + snapshot: '20220617' + updates: '20220801' +version: '2' +pipelines: + - name: build + source-epoch: 1659397331 + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + - id: modular + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/ + - id: updates + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/ + - id: updates-modular + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/ + packages: + - binutils + - btrfs-progs + - cryptsetup + - dnf + - dosfstools + - e2fsprogs + - gdisk + - grub2-pc + - policycoreutils + - python3-iniparse + - python3-toml + - qemu-img + - rpm-ostree + - systemd + - tar + - xfsprogs + - xz + - lvm2 + - selinux-policy-targeted + - genisoimage + - isomd5sum + - xorriso + - syslinux + - skopeo + - lorax-templates-generic + - syslinux-nonlinux + - squashfs-tools + - grub2-pc-modules + - grub2-tools + - grub2-efi-x64 + - shim-x64 + - efibootmgr + - grub2-tools-minimal + - grub2-tools-extra + - grub2-tools-efi + - grub2-efi-x64 + - grub2-efi-x64-cdboot + - shim-ia32 + - grub2-efi-ia32-cdboot + 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" + exclude: + docs: true + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0 diff --git a/test/data/manifests/fedora-build.mpp.yaml b/test/data/manifests/fedora-build.mpp.yaml index bfa46614..6cc3a18a 100644 --- a/test/data/manifests/fedora-build.mpp.yaml +++ b/test/data/manifests/fedora-build.mpp.yaml @@ -1,51 +1,34 @@ -{ - "pipeline": { - "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": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "btrfs-progs", - "dnf", - "dosfstools", - "e2fsprogs", - "grub2-pc", - "policycoreutils", - "python3-iniparse", - "python3-pyyaml", - "qemu-img", - "rpm-ostree", - "selinux-policy-targeted", - "systemd", - "tar", - "xfsprogs", - "xz" - ] - } - } - }, - { - "name": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts", - "labels": { - "/usr/bin/cp": "system_u:object_r:install_exec_t:s0", - "/usr/bin/tar": "system_u:object_r:install_exec_t:s0" - } - } - } - ] - } -} +pipeline: + 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: $arch + module-platform-id: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + packages: + - btrfs-progs + - dnf + - dosfstools + - e2fsprogs + - grub2-pc + - policycoreutils + - python3-iniparse + - python3-pyyaml + - qemu-img + - rpm-ostree + - selinux-policy-targeted + - systemd + - tar + - xfsprogs + - xz + - name: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0 diff --git a/test/data/manifests/fedora-container.mpp.yaml b/test/data/manifests/fedora-container.mpp.yaml index 01e6cd9b..6286ce14 100644 --- a/test/data/manifests/fedora-container.mpp.yaml +++ b/test/data/manifests/fedora-container.mpp.yaml @@ -1,122 +1,79 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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-container", - "bash", - "coreutils", - "glibc-minimal-langpack", - "rpm", - "shadow-utils", - "sssd-client", - "util-linux", - "microdnf", - "nginx" - ], - "excludes": [ - "kernel", - "dosfstools", - "e2fsprogs", - "fuse-libs", - "gnupg2-smime", - "libss", - "pinentry", - "shared-mime-info", - "trousers", - "xkeyboard-config", - "grubby" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - }, - "install_langs": [ - "en_US" - ] - } - }, - { - "type": "org.osbuild.rpm.macros", - "options": { - "filename": "/etc/rpm/macros.image-language-conf", - "macros": { - "_install_langs": [ - "en_US" - ] - } - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - } - ] - }, - { - "name": "container", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.oci-archive", - "inputs": { - "base": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:tree" - ] - } - }, - "options": { - "architecture": "amd64", - "filename": "fedora-container.tar", - "config": { - "Cmd": [ - "nginx", - "-g", - "daemon off;" - ], - "ExposedPorts": [ - "80" - ] - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + 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-container + - bash + - coreutils + - glibc-minimal-langpack + - rpm + - shadow-utils + - sssd-client + - util-linux + - microdnf + - nginx + excludes: + - kernel + - dosfstools + - e2fsprogs + - fuse-libs + - gnupg2-smime + - libss + - pinentry + - shared-mime-info + - trousers + - xkeyboard-config + - grubby + 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" + exclude: + docs: true + install_langs: + - en_US + - type: org.osbuild.rpm.macros + options: + filename: /etc/rpm/macros.image-language-conf + macros: + _install_langs: + - en_US + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - name: container + build: name:build + stages: + - type: org.osbuild.oci-archive + inputs: + base: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:tree + options: + architecture: amd64 + filename: fedora-container.tar + config: + Cmd: + - nginx + - -g + - daemon off; + ExposedPorts: + - '80' diff --git a/test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml b/test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml index 732eefe8..15a65d37 100644 --- a/test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml +++ b/test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml @@ -1,848 +1,595 @@ -{ - "version": "2", - "mpp-vars": { - "arch": "x86_64", - "version": 34, - "relver": "f$version", - "snapshot": "20210512", - "ref": "fedora/$arch/osbuild", - "isolabel": "Fedora-$version-X86_64" - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "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": "$arch", - "module-platform-id": "$relver", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/" - } - ], - "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", - "chrony", - "zram-generator-defaults", - "cryptsetup", - "pinentry", - "keyutils", - "e2fsprogs", - "dosfstools", - "gnupg2", - "basesystem", - "python3", - "bash", - "xz", - "gzip", - "coreutils", - "which", - "curl", - "firewalld", - "iptables", - "NetworkManager", - "NetworkManager-wifi", - "NetworkManager-wwan", - "wpa_supplicant", - "iwd", - "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", - "fwupd", - "greenboot", - "greenboot-grub2", - "greenboot-rpm-ostree-grub2", - "greenboot-reboot", - "greenboot-status", - "ignition", - "rsync", - "ima-evm-utils", - "bash-completion", - "tmux", - "screen", - "policycoreutils-python-utils", - "setools-console", - "audit", - "rng-tools", - "bluez", - "bluez-libs", - "bluez-mesh", - "wpan-tools", - "kernel-tools", - "libgpiod-utils", - "podman", - "container-selinux", - "skopeo", - "criu", - "slirp4netns", - "clevis", - "clevis-dracut", - "clevis-luks", - "attr", - "grub2", - "grub2-efi-x64", - "efibootmgr", - "shim-x64", - "microcode_ctl", - "iwl1000-firmware", - "iwl100-firmware", - "iwl105-firmware", - "iwl135-firmware", - "iwl2000-firmware", - "iwl2030-firmware", - "iwl3160-firmware", - "iwl5000-firmware", - "iwl5150-firmware", - "iwl6000-firmware", - "iwl6050-firmware", - "iwl7260-firmware" - ], - "excludes": [ - "dracut-config-rescue" - ] - } - } - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "rngd.service", - "sshd.service" - ] - } - }, - { - "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": { - "mpp-format-string": "{ref}" - }, - "os_version": { - "mpp-format-string": "{version}" - } - } - } - ] - }, - { - "name": "anaconda-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$relver", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "anaconda", - "anaconda-widgets", - "kexec-tools-anaconda-addon", - "anaconda-install-env-deps", - "dnf", - "rpm-ostree", - "ostree", - "pigz", - "kernel", - "kernel-modules", - "kernel-modules-extra", - "grubby", - "b43-openfwwf", - "glibc-all-langpacks", - "grub2-tools-efi", - "efibootmgr", - "shim-x64", - "grub2-efi-x64-cdboot", - "shim-ia32", - "grub2-efi-ia32-cdboot", - "biosdevname", - "memtest86+", - "syslinux", - "grub2-tools", - "grub2-tools-minimal", - "grub2-tools-extra", - "plymouth", - "anaconda-dracut", - "dracut-network", - "dracut-config-generic", - "initscripts", - "cryptsetup", - "rpcbind", - "kbd", - "kbd-misc", - "tar", - "xz", - "curl", - "bzip2", - "systemd-sysv", - "systemd-units", - "rsyslog", - "xorg-x11-drivers", - "xorg-x11-server-Xorg", - "xrandr", - "xrdb", - "xorg-x11-xauth", - "xorg-x11-xauth", - "dbus-x11", - "metacity", - "gsettings-desktop-schemas", - "nm-connection-editor", - "librsvg2", - "btrfs-progs", - "jfsutils", - "xfsprogs", - "reiserfs-utils", - "gfs2-utils", - "ntfs-3g", - "ntfsprogs", - "system-storage-manager", - "device-mapper-persistent-data", - "xfsdump", - "udisks2", - "udisks2-iscsi", - "hostname", - "libblockdev-lvm-dbus", - "volume_key", - "nss-tools", - "selinux-policy-targeted", - "audit", - "ethtool", - "openssh-server", - "nfs-utils", - "openssh-clients", - "tigervnc-server-minimal", - "tigervnc-server-module", - "net-tools", - "bridge-utils", - "nmap-ncat", - "pciutils", - "usbutils", - "ipmitool", - "mt-st", - "smartmontools", - "hdparm", - "pcmciautils", - "libmlx4", - "rdma-core", - "rng-tools", - "dmidecode", - "aajohan-comfortaa-fonts", - "abattis-cantarell-fonts", - "bitmap-fangsongti-fonts", - "dejavu-sans-fonts", - "dejavu-sans-mono-fonts", - "google-noto-sans-cjk-ttc-fonts", - "google-noto-sans-gurmukhi-fonts", - "google-noto-sans-sinhala-vf-fonts", - "jomolhari-fonts", - "khmeros-base-fonts", - "lohit-assamese-fonts", - "lohit-bengali-fonts", - "lohit-devanagari-fonts", - "lohit-gujarati-fonts", - "lohit-kannada-fonts", - "lohit-marathi-fonts", - "lohit-odia-fonts", - "lohit-tamil-fonts", - "lohit-telugu-fonts", - "madan-fonts", - "paktype-naskh-basic-fonts", - "sil-abyssinica-fonts", - "sil-padauk-fonts", - "sil-scheherazade-fonts", - "smc-meera-fonts", - "thai-scalable-waree-fonts", - "xorg-x11-fonts-misc", - "gdb-gdbserver", - "libreport-plugin-bugzilla", - "libreport-plugin-reportuploader", - "fpaste", - "python3-pyatspi", - "vim-minimal", - "strace", - "lsof", - "dump", - "xz", - "less", - "wget", - "rsync", - "bind-utils", - "ftp", - "mtr", - "vconfig", - "icfg", - "spice-vdagent", - "gdisk", - "hexedit", - "sg3_utils", - "notification-daemon" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - }, - "disable_dracut": true - } - }, - { - "type": "org.osbuild.buildstamp", - "options": { - "arch": { - "mpp-format-string": "{arch}" - }, - "product": "Fedora-IoT", - "version": { - "mpp-format-string": "{version}" - }, - "variant": "osbuild", - "final": true, - "bugurl": "https://github.com/gicmo/ostree-osbuild-demo/issues" - } - }, - { - "type": "org.osbuild.dracut", - "options": { - "kernel": [ - { - "mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}" - } - ], - "add_modules": [ - "anaconda", - "convertfs", - "dmsquash-live", - "livenet", - "pollcdrom", - "qemu", - "qemu-net" - ], - "install": [ - "/.buildstamp" - ] - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "root": { - "password": "" - }, - "install": { - "uid": 0, - "gid": 0, - "home": "/root", - "shell": "/usr/libexec/anaconda/run-anaconda", - "password": "" - } - } - } - }, - { - "type": "org.osbuild.anaconda", - "options": { - "kickstart-modules": [ - "org.fedoraproject.Anaconda.Modules.Network", - "org.fedoraproject.Anaconda.Modules.Payloads", - "org.fedoraproject.Anaconda.Modules.Storage", - "org.fedoraproject.Anaconda.Modules.Users" - ] - } - }, - { - "type": "org.osbuild.lorax-script", - "options": { - "path": "99-generic/runtime-postinstall.tmpl", - "basearch": { - "mpp-format-string": "{arch}" - } - } - } - ] - }, - { - "name": "rootfs-image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "LiveOS" - } - ] - } - }, - { - "type": "org.osbuild.truncate", - "options": { - "filename": "LiveOS/rootfs.img", - "size": "3GB" - } - }, - { - "type": "org.osbuild.mkfs.ext4", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "LiveOS/rootfs.img" - } - } - }, - "options": { - "label": "Anaconda", - "uuid": "383367fa-6a09-4def-8c30-507e0b3cf1f7" - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:anaconda-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://tree/", - "to": "mount://root/" - } - ] - }, - "devices": { - "root": { - "type": "org.osbuild.loopback", - "options": { - "filename": "LiveOS/rootfs.img" - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.ext4", - "source": "root", - "target": "/" - } - ] - } - ] - }, - { - "name": "efiboot-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.grub2.iso", - "options": { - "product": { - "name": "Fedora-IoT", - "version": { - "mpp-format-string": "{version}" - } - }, - "isolabel": { - "mpp-format-string": "{isolabel}" - }, - "kernel": { - "dir": "/images/pxeboot", - "opts": [ - { - "mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks" - } - ] - }, - "architectures": [ - "IA32", - "X64" - ], - "vendor": "fedora" - } - } - ] - }, - { - "name": "bootiso-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "images" - }, - { - "path": "images/pxeboot" - } - ] - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "base": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:anaconda-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://base/boot/vmlinuz-{rpms['anaconda-tree']['kernel'].evra}" - }, - "to": "tree:///images/pxeboot/vmlinuz" - }, - { - "from": { - "mpp-format-string": "input://base/boot/initramfs-{rpms['anaconda-tree']['kernel'].evra}.img" - }, - "to": "tree:///images/pxeboot/initrd.img" - } - ] - } - }, - { - "type": "org.osbuild.squashfs", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:rootfs-image" - ] - } - }, - "options": { - "filename": "images/install.img", - "compression": { - "method": "xz", - "options": { - "bcj": "x86" - } - } - } - }, - { - "type": "org.osbuild.isolinux", - "inputs": { - "data": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:anaconda-tree" - ] - } - }, - "options": { - "product": { - "name": "Fedora-IoT", - "version": { - "mpp-format-string": "{version}" - } - }, - "kernel": { - "dir": "/images/pxeboot", - "opts": [ - { - "mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks" - } - ] - } - } - }, - { - "type": "org.osbuild.truncate", - "options": { - "filename": "images/efiboot.img", - "size": "20MB" - } - }, - { - "type": "org.osbuild.mkfs.fat", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "images/efiboot.img" - } - } - }, - "options": { - "label": "ANACONDA", - "volid": "7B7795E7" - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:efiboot-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://tree/", - "to": "mount://efi/" - } - ] - }, - "devices": { - "efi": { - "type": "org.osbuild.loopback", - "options": { - "filename": "images/efiboot.img" - } - } - }, - "mounts": [ - { - "name": "efi", - "type": "org.osbuild.fat", - "source": "efi", - "target": "/" - } - ] - }, - { - "type": "org.osbuild.copy", - "inputs": { - "base": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:efiboot-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://base/EFI", - "to": "tree:///" - } - ] - } - }, - { - "type": "org.osbuild.ostree.init", - "options": { - "path": "/ostree" - } - }, - { - "type": "org.osbuild.ostree.pull", - "options": { - "repo": "/ostree" - }, - "inputs": { - "commits": { - "type": "org.osbuild.ostree", - "origin": "org.osbuild.pipeline", - "references": { - "name:ostree-commit": { - "ref": { - "mpp-format-string": "{ref}" - } - } - } - } - } - }, - { - "type": "org.osbuild.kickstart", - "options": { - "path": "install.ks", - "ostree": { - "osname": "fedora", - "url": "file:///run/install/repo/ostree", - "ref": { - "mpp-format-string": "{ref}" - }, - "gpg": false - }, - "users": { - "core": { - "password": "edge", - "groups": [ - "wheel" - ] - } - } - } - }, - { - "type": "org.osbuild.discinfo", - "options": { - "basearch": { - "mpp-format-string": "{arch}" - }, - "release": "202010217.n.0" - } - } - ] - }, - { - "name": "bootiso", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.xorrisofs", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:bootiso-tree" - ] - } - }, - "options": { - "filename": "fedora-ostree-boot.iso", - "volid": { - "mpp-format-string": "{isolabel}" - }, - "boot": { - "image": "isolinux/isolinux.bin", - "catalog": "isolinux/boot.cat" - }, - "efi": "images/efiboot.img", - "isohybridmbr": "/usr/share/syslinux/isohdpfx.bin" - } - }, - { - "type": "org.osbuild.implantisomd5", - "options": { - "filename": "fedora-ostree-boot.iso" - } - } - ] - } - ] -} +version: '2' +mpp-vars: + arch: x86_64 + version: 34 + relver: f$version + snapshot: '20210512' + ref: fedora/$arch/osbuild + isolabel: Fedora-$version-X86_64 +pipelines: + - mpp-import-pipeline: + path: f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - 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: $arch + module-platform-id: $relver + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/ + 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 + - chrony + - zram-generator-defaults + - cryptsetup + - pinentry + - keyutils + - e2fsprogs + - dosfstools + - gnupg2 + - basesystem + - python3 + - bash + - xz + - gzip + - coreutils + - which + - curl + - firewalld + - iptables + - NetworkManager + - NetworkManager-wifi + - NetworkManager-wwan + - wpa_supplicant + - iwd + - 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 + - fwupd + - greenboot + - greenboot-grub2 + - greenboot-rpm-ostree-grub2 + - greenboot-reboot + - greenboot-status + - ignition + - rsync + - ima-evm-utils + - bash-completion + - tmux + - screen + - policycoreutils-python-utils + - setools-console + - audit + - rng-tools + - bluez + - bluez-libs + - bluez-mesh + - wpan-tools + - kernel-tools + - libgpiod-utils + - podman + - container-selinux + - skopeo + - criu + - slirp4netns + - clevis + - clevis-dracut + - clevis-luks + - attr + - grub2 + - grub2-efi-x64 + - efibootmgr + - shim-x64 + - microcode_ctl + - iwl1000-firmware + - iwl100-firmware + - iwl105-firmware + - iwl135-firmware + - iwl2000-firmware + - iwl2030-firmware + - iwl3160-firmware + - iwl5000-firmware + - iwl5150-firmware + - iwl6000-firmware + - iwl6050-firmware + - iwl7260-firmware + excludes: + - dracut-config-rescue + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.systemd + options: + enabled_services: + - NetworkManager.service + - firewalld.service + - rngd.service + - sshd.service + - 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: + mpp-format-string: '{ref}' + os_version: + mpp-format-string: '{version}' + - name: anaconda-tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $relver + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/ + packages: + - anaconda + - anaconda-widgets + - kexec-tools-anaconda-addon + - anaconda-install-env-deps + - dnf + - rpm-ostree + - ostree + - pigz + - kernel + - kernel-modules + - kernel-modules-extra + - grubby + - b43-openfwwf + - glibc-all-langpacks + - grub2-tools-efi + - efibootmgr + - shim-x64 + - grub2-efi-x64-cdboot + - shim-ia32 + - grub2-efi-ia32-cdboot + - biosdevname + - memtest86+ + - syslinux + - grub2-tools + - grub2-tools-minimal + - grub2-tools-extra + - plymouth + - anaconda-dracut + - dracut-network + - dracut-config-generic + - initscripts + - cryptsetup + - rpcbind + - kbd + - kbd-misc + - tar + - xz + - curl + - bzip2 + - systemd-sysv + - systemd-units + - rsyslog + - xorg-x11-drivers + - xorg-x11-server-Xorg + - xrandr + - xrdb + - xorg-x11-xauth + - xorg-x11-xauth + - dbus-x11 + - metacity + - gsettings-desktop-schemas + - nm-connection-editor + - librsvg2 + - btrfs-progs + - jfsutils + - xfsprogs + - reiserfs-utils + - gfs2-utils + - ntfs-3g + - ntfsprogs + - system-storage-manager + - device-mapper-persistent-data + - xfsdump + - udisks2 + - udisks2-iscsi + - hostname + - libblockdev-lvm-dbus + - volume_key + - nss-tools + - selinux-policy-targeted + - audit + - ethtool + - openssh-server + - nfs-utils + - openssh-clients + - tigervnc-server-minimal + - tigervnc-server-module + - net-tools + - bridge-utils + - nmap-ncat + - pciutils + - usbutils + - ipmitool + - mt-st + - smartmontools + - hdparm + - pcmciautils + - libmlx4 + - rdma-core + - rng-tools + - dmidecode + - aajohan-comfortaa-fonts + - abattis-cantarell-fonts + - bitmap-fangsongti-fonts + - dejavu-sans-fonts + - dejavu-sans-mono-fonts + - google-noto-sans-cjk-ttc-fonts + - google-noto-sans-gurmukhi-fonts + - google-noto-sans-sinhala-vf-fonts + - jomolhari-fonts + - khmeros-base-fonts + - lohit-assamese-fonts + - lohit-bengali-fonts + - lohit-devanagari-fonts + - lohit-gujarati-fonts + - lohit-kannada-fonts + - lohit-marathi-fonts + - lohit-odia-fonts + - lohit-tamil-fonts + - lohit-telugu-fonts + - madan-fonts + - paktype-naskh-basic-fonts + - sil-abyssinica-fonts + - sil-padauk-fonts + - sil-scheherazade-fonts + - smc-meera-fonts + - thai-scalable-waree-fonts + - xorg-x11-fonts-misc + - gdb-gdbserver + - libreport-plugin-bugzilla + - libreport-plugin-reportuploader + - fpaste + - python3-pyatspi + - vim-minimal + - strace + - lsof + - dump + - xz + - less + - wget + - rsync + - bind-utils + - ftp + - mtr + - vconfig + - icfg + - spice-vdagent + - gdisk + - hexedit + - sg3_utils + - notification-daemon + 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" + exclude: + docs: true + disable_dracut: true + - type: org.osbuild.buildstamp + options: + arch: + mpp-format-string: '{arch}' + product: Fedora-IoT + version: + mpp-format-string: '{version}' + variant: osbuild + final: true + bugurl: https://github.com/gicmo/ostree-osbuild-demo/issues + - type: org.osbuild.dracut + options: + kernel: + - mpp-format-string: '{rpms[''ostree-tree''][''kernel''].evra}' + add_modules: + - anaconda + - convertfs + - dmsquash-live + - livenet + - pollcdrom + - qemu + - qemu-net + install: + - /.buildstamp + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.users + options: + users: + root: + password: '' + install: + uid: 0 + gid: 0 + home: /root + shell: /usr/libexec/anaconda/run-anaconda + password: '' + - type: org.osbuild.anaconda + options: + kickstart-modules: + - org.fedoraproject.Anaconda.Modules.Network + - org.fedoraproject.Anaconda.Modules.Payloads + - org.fedoraproject.Anaconda.Modules.Storage + - org.fedoraproject.Anaconda.Modules.Users + - type: org.osbuild.lorax-script + options: + path: 99-generic/runtime-postinstall.tmpl + basearch: + mpp-format-string: '{arch}' + - name: rootfs-image + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: LiveOS + - type: org.osbuild.truncate + options: + filename: LiveOS/rootfs.img + size: 3GB + - type: org.osbuild.mkfs.ext4 + devices: + device: + type: org.osbuild.loopback + options: + filename: LiveOS/rootfs.img + options: + label: Anaconda + uuid: 383367fa-6a09-4def-8c30-507e0b3cf1f7 + - type: org.osbuild.copy + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:anaconda-tree + options: + paths: + - from: input://tree/ + to: mount://root/ + devices: + root: + type: org.osbuild.loopback + options: + filename: LiveOS/rootfs.img + mounts: + - name: root + type: org.osbuild.ext4 + source: root + target: / + - name: efiboot-tree + build: name:build + stages: + - type: org.osbuild.grub2.iso + options: + product: + name: Fedora-IoT + version: + mpp-format-string: '{version}' + isolabel: + mpp-format-string: '{isolabel}' + kernel: + dir: /images/pxeboot + opts: + - mpp-format-string: inst.ks=hd:LABEL={isolabel}:/install.ks + architectures: + - IA32 + - X64 + vendor: fedora + - name: bootiso-tree + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: images + - path: images/pxeboot + - type: org.osbuild.copy + inputs: + base: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:anaconda-tree + options: + paths: + - from: + mpp-format-string: input://base/boot/vmlinuz-{rpms['anaconda-tree']['kernel'].evra} + to: tree:///images/pxeboot/vmlinuz + - from: + mpp-format-string: input://base/boot/initramfs-{rpms['anaconda-tree']['kernel'].evra}.img + to: tree:///images/pxeboot/initrd.img + - type: org.osbuild.squashfs + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:rootfs-image + options: + filename: images/install.img + compression: + method: xz + options: + bcj: x86 + - type: org.osbuild.isolinux + inputs: + data: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:anaconda-tree + options: + product: + name: Fedora-IoT + version: + mpp-format-string: '{version}' + kernel: + dir: /images/pxeboot + opts: + - mpp-format-string: inst.ks=hd:LABEL={isolabel}:/install.ks + - type: org.osbuild.truncate + options: + filename: images/efiboot.img + size: 20MB + - type: org.osbuild.mkfs.fat + devices: + device: + type: org.osbuild.loopback + options: + filename: images/efiboot.img + options: + label: ANACONDA + volid: 7B7795E7 + - type: org.osbuild.copy + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:efiboot-tree + options: + paths: + - from: input://tree/ + to: mount://efi/ + devices: + efi: + type: org.osbuild.loopback + options: + filename: images/efiboot.img + mounts: + - name: efi + type: org.osbuild.fat + source: efi + target: / + - type: org.osbuild.copy + inputs: + base: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:efiboot-tree + options: + paths: + - from: input://base/EFI + to: tree:/// + - type: org.osbuild.ostree.init + options: + path: /ostree + - type: org.osbuild.ostree.pull + options: + repo: /ostree + inputs: + commits: + type: org.osbuild.ostree + origin: org.osbuild.pipeline + references: + name:ostree-commit: + ref: + mpp-format-string: '{ref}' + - type: org.osbuild.kickstart + options: + path: install.ks + ostree: + osname: fedora + url: file:///run/install/repo/ostree + ref: + mpp-format-string: '{ref}' + gpg: false + users: + core: + password: edge + groups: + - wheel + - type: org.osbuild.discinfo + options: + basearch: + mpp-format-string: '{arch}' + release: 202010217.n.0 + - name: bootiso + build: name:build + stages: + - type: org.osbuild.xorrisofs + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:bootiso-tree + options: + filename: fedora-ostree-boot.iso + volid: + mpp-format-string: '{isolabel}' + boot: + image: isolinux/isolinux.bin + catalog: isolinux/boot.cat + efi: images/efiboot.img + isohybridmbr: /usr/share/syslinux/isohdpfx.bin + - type: org.osbuild.implantisomd5 + options: + filename: fedora-ostree-boot.iso diff --git a/test/data/manifests/fedora-ostree-bootiso.mpp.yaml b/test/data/manifests/fedora-ostree-bootiso.mpp.yaml index 0498d00f..94515475 100644 --- a/test/data/manifests/fedora-ostree-bootiso.mpp.yaml +++ b/test/data/manifests/fedora-ostree-bootiso.mpp.yaml @@ -1,845 +1,593 @@ -{ - "version": "2", - "mpp-vars": { - "arch": "x86_64", - "version": 34, - "relver": "f$version", - "snapshot": "20210512", - "ref": "fedora/$arch/osbuild", - "isolabel": "Fedora-$version-X86_64" - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "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": "$arch", - "module-platform-id": "$relver", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/" - } - ], - "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", - "chrony", - "zram-generator-defaults", - "cryptsetup", - "pinentry", - "keyutils", - "e2fsprogs", - "dosfstools", - "gnupg2", - "basesystem", - "python3", - "bash", - "xz", - "gzip", - "coreutils", - "which", - "curl", - "firewalld", - "iptables", - "NetworkManager", - "NetworkManager-wifi", - "NetworkManager-wwan", - "wpa_supplicant", - "iwd", - "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", - "fwupd", - "greenboot", - "greenboot-grub2", - "greenboot-rpm-ostree-grub2", - "greenboot-reboot", - "greenboot-status", - "ignition", - "rsync", - "ima-evm-utils", - "bash-completion", - "tmux", - "screen", - "policycoreutils-python-utils", - "setools-console", - "audit", - "rng-tools", - "bluez", - "bluez-libs", - "bluez-mesh", - "wpan-tools", - "kernel-tools", - "libgpiod-utils", - "podman", - "container-selinux", - "skopeo", - "criu", - "slirp4netns", - "clevis", - "clevis-dracut", - "clevis-luks", - "attr", - "grub2", - "grub2-efi-x64", - "efibootmgr", - "shim-x64", - "microcode_ctl", - "iwl1000-firmware", - "iwl100-firmware", - "iwl105-firmware", - "iwl135-firmware", - "iwl2000-firmware", - "iwl2030-firmware", - "iwl3160-firmware", - "iwl5000-firmware", - "iwl5150-firmware", - "iwl6000-firmware", - "iwl6050-firmware", - "iwl7260-firmware" - ], - "excludes": [ - "dracut-config-rescue" - ] - } - } - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "firewalld.service", - "rngd.service", - "sshd.service" - ] - } - }, - { - "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": { - "mpp-format-string": "{ref}" - }, - "os_version": { - "mpp-format-string": "{version}" - } - } - } - ] - }, - { - "name": "anaconda-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$relver", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "anaconda", - "anaconda-widgets", - "kexec-tools-anaconda-addon", - "anaconda-install-env-deps", - "dnf", - "rpm-ostree", - "ostree", - "pigz", - "kernel", - "kernel-modules", - "kernel-modules-extra", - "grubby", - "b43-openfwwf", - "glibc-all-langpacks", - "grub2-tools-efi", - "efibootmgr", - "shim-x64", - "grub2-efi-x64-cdboot", - "shim-ia32", - "grub2-efi-ia32-cdboot", - "biosdevname", - "memtest86+", - "syslinux", - "grub2-tools", - "grub2-tools-minimal", - "grub2-tools-extra", - "plymouth", - "anaconda-dracut", - "dracut-network", - "dracut-config-generic", - "initscripts", - "cryptsetup", - "rpcbind", - "kbd", - "kbd-misc", - "tar", - "xz", - "curl", - "bzip2", - "systemd-sysv", - "systemd-units", - "rsyslog", - "xorg-x11-drivers", - "xorg-x11-server-Xorg", - "xrandr", - "xrdb", - "xorg-x11-xauth", - "xorg-x11-xauth", - "dbus-x11", - "metacity", - "gsettings-desktop-schemas", - "nm-connection-editor", - "librsvg2", - "btrfs-progs", - "jfsutils", - "xfsprogs", - "reiserfs-utils", - "gfs2-utils", - "ntfs-3g", - "ntfsprogs", - "system-storage-manager", - "device-mapper-persistent-data", - "xfsdump", - "udisks2", - "udisks2-iscsi", - "hostname", - "libblockdev-lvm-dbus", - "volume_key", - "nss-tools", - "selinux-policy-targeted", - "audit", - "ethtool", - "openssh-server", - "nfs-utils", - "openssh-clients", - "tigervnc-server-minimal", - "tigervnc-server-module", - "net-tools", - "bridge-utils", - "nmap-ncat", - "pciutils", - "usbutils", - "ipmitool", - "mt-st", - "smartmontools", - "hdparm", - "pcmciautils", - "libmlx4", - "rdma-core", - "rng-tools", - "dmidecode", - "aajohan-comfortaa-fonts", - "abattis-cantarell-fonts", - "bitmap-fangsongti-fonts", - "dejavu-sans-fonts", - "dejavu-sans-mono-fonts", - "google-noto-sans-cjk-ttc-fonts", - "google-noto-sans-gurmukhi-fonts", - "google-noto-sans-sinhala-vf-fonts", - "jomolhari-fonts", - "khmeros-base-fonts", - "lohit-assamese-fonts", - "lohit-bengali-fonts", - "lohit-devanagari-fonts", - "lohit-gujarati-fonts", - "lohit-kannada-fonts", - "lohit-marathi-fonts", - "lohit-odia-fonts", - "lohit-tamil-fonts", - "lohit-telugu-fonts", - "madan-fonts", - "paktype-naskh-basic-fonts", - "sil-abyssinica-fonts", - "sil-padauk-fonts", - "sil-scheherazade-fonts", - "smc-meera-fonts", - "thai-scalable-waree-fonts", - "xorg-x11-fonts-misc", - "gdb-gdbserver", - "libreport-plugin-bugzilla", - "libreport-plugin-reportuploader", - "fpaste", - "python3-pyatspi", - "vim-minimal", - "strace", - "lsof", - "dump", - "xz", - "less", - "wget", - "rsync", - "bind-utils", - "ftp", - "mtr", - "vconfig", - "icfg", - "spice-vdagent", - "gdisk", - "hexedit", - "sg3_utils", - "notification-daemon" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - }, - "disable_dracut": true - } - }, - { - "type": "org.osbuild.buildstamp", - "options": { - "arch": { - "mpp-format-string": "{arch}" - }, - "product": "Fedora-IoT", - "version": { - "mpp-format-string": "{version}" - }, - "variant": "osbuild", - "final": true, - "bugurl": "https://github.com/gicmo/ostree-osbuild-demo/issues" - } - }, - { - "type": "org.osbuild.dracut", - "options": { - "kernel": [ - { - "mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}" - } - ], - "add_modules": [ - "anaconda", - "convertfs", - "dmsquash-live", - "livenet", - "pollcdrom", - "qemu", - "qemu-net" - ], - "install": [ - "/.buildstamp" - ] - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "root": { - "password": "" - }, - "install": { - "uid": 0, - "gid": 0, - "home": "/root", - "shell": "/usr/libexec/anaconda/run-anaconda", - "password": "" - } - } - } - }, - { - "type": "org.osbuild.anaconda", - "options": { - "kickstart-modules": [ - "org.fedoraproject.Anaconda.Modules.Network", - "org.fedoraproject.Anaconda.Modules.Payloads", - "org.fedoraproject.Anaconda.Modules.Storage", - "org.fedoraproject.Anaconda.Modules.Users" - ] - } - }, - { - "type": "org.osbuild.lorax-script", - "options": { - "path": "99-generic/runtime-postinstall.tmpl", - "basearch": { - "mpp-format-string": "{arch}" - } - } - } - ] - }, - { - "name": "rootfs-image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "LiveOS" - } - ] - } - }, - { - "type": "org.osbuild.truncate", - "options": { - "filename": "LiveOS/rootfs.img", - "size": "3GB" - } - }, - { - "type": "org.osbuild.mkfs.ext4", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "LiveOS/rootfs.img" - } - } - }, - "options": { - "label": "Anaconda", - "uuid": "383367fa-6a09-4def-8c30-507e0b3cf1f7" - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:anaconda-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://tree/", - "to": "mount://root/" - } - ] - }, - "devices": { - "root": { - "type": "org.osbuild.loopback", - "options": { - "filename": "LiveOS/rootfs.img" - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.ext4", - "source": "root", - "target": "/" - } - ] - } - ] - }, - { - "name": "efiboot-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.grub2.iso", - "options": { - "product": { - "name": "Fedora-IoT", - "version": { - "mpp-format-string": "{version}" - } - }, - "isolabel": { - "mpp-format-string": "{isolabel}" - }, - "kernel": { - "dir": "/images/pxeboot", - "opts": [ - { - "mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks" - } - ] - }, - "architectures": [ - "IA32", - "X64" - ], - "vendor": "fedora" - } - } - ] - }, - { - "name": "bootiso-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "images" - }, - { - "path": "images/pxeboot" - } - ] - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "base": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:anaconda-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://base/boot/vmlinuz-{rpms['anaconda-tree']['kernel'].evra}" - }, - "to": "tree:///images/pxeboot/vmlinuz" - }, - { - "from": { - "mpp-format-string": "input://base/boot/initramfs-{rpms['anaconda-tree']['kernel'].evra}.img" - }, - "to": "tree:///images/pxeboot/initrd.img" - } - ] - } - }, - { - "type": "org.osbuild.squashfs", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:rootfs-image" - ] - } - }, - "options": { - "filename": "images/install.img", - "compression": { - "method": "lz4" - } - } - }, - { - "type": "org.osbuild.isolinux", - "inputs": { - "data": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:anaconda-tree" - ] - } - }, - "options": { - "product": { - "name": "Fedora-IoT", - "version": { - "mpp-format-string": "{version}" - } - }, - "kernel": { - "dir": "/images/pxeboot", - "opts": [ - { - "mpp-format-string": "inst.ks=hd:LABEL={isolabel}:/install.ks" - } - ] - } - } - }, - { - "type": "org.osbuild.truncate", - "options": { - "filename": "images/efiboot.img", - "size": "20MB" - } - }, - { - "type": "org.osbuild.mkfs.fat", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "images/efiboot.img" - } - } - }, - "options": { - "label": "ANACONDA", - "volid": "7B7795E7" - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:efiboot-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://tree/", - "to": "mount://efi/" - } - ] - }, - "devices": { - "efi": { - "type": "org.osbuild.loopback", - "options": { - "filename": "images/efiboot.img" - } - } - }, - "mounts": [ - { - "name": "efi", - "type": "org.osbuild.fat", - "source": "efi", - "target": "/" - } - ] - }, - { - "type": "org.osbuild.copy", - "inputs": { - "base": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:efiboot-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://base/EFI", - "to": "tree:///" - } - ] - } - }, - { - "type": "org.osbuild.ostree.init", - "options": { - "path": "/ostree" - } - }, - { - "type": "org.osbuild.ostree.pull", - "options": { - "repo": "/ostree" - }, - "inputs": { - "commits": { - "type": "org.osbuild.ostree", - "origin": "org.osbuild.pipeline", - "references": { - "name:ostree-commit": { - "ref": { - "mpp-format-string": "{ref}" - } - } - } - } - } - }, - { - "type": "org.osbuild.kickstart", - "options": { - "path": "install.ks", - "ostree": { - "osname": "fedora", - "url": "file:///run/install/repo/ostree", - "ref": { - "mpp-format-string": "{ref}" - }, - "gpg": false - }, - "users": { - "core": { - "password": "edge", - "groups": [ - "wheel" - ] - } - } - } - }, - { - "type": "org.osbuild.discinfo", - "options": { - "basearch": { - "mpp-format-string": "{arch}" - }, - "release": "202010217.n.0" - } - } - ] - }, - { - "name": "bootiso", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.xorrisofs", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:bootiso-tree" - ] - } - }, - "options": { - "filename": "fedora-ostree-boot.iso", - "volid": { - "mpp-format-string": "{isolabel}" - }, - "boot": { - "image": "isolinux/isolinux.bin", - "catalog": "isolinux/boot.cat" - }, - "efi": "images/efiboot.img", - "isohybridmbr": "/usr/share/syslinux/isohdpfx.bin" - } - }, - { - "type": "org.osbuild.implantisomd5", - "options": { - "filename": "fedora-ostree-boot.iso" - } - } - ] - } - ] -} +version: '2' +mpp-vars: + arch: x86_64 + version: 34 + relver: f$version + snapshot: '20210512' + ref: fedora/$arch/osbuild + isolabel: Fedora-$version-X86_64 +pipelines: + - mpp-import-pipeline: + path: f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - 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: $arch + module-platform-id: $relver + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/ + 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 + - chrony + - zram-generator-defaults + - cryptsetup + - pinentry + - keyutils + - e2fsprogs + - dosfstools + - gnupg2 + - basesystem + - python3 + - bash + - xz + - gzip + - coreutils + - which + - curl + - firewalld + - iptables + - NetworkManager + - NetworkManager-wifi + - NetworkManager-wwan + - wpa_supplicant + - iwd + - 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 + - fwupd + - greenboot + - greenboot-grub2 + - greenboot-rpm-ostree-grub2 + - greenboot-reboot + - greenboot-status + - ignition + - rsync + - ima-evm-utils + - bash-completion + - tmux + - screen + - policycoreutils-python-utils + - setools-console + - audit + - rng-tools + - bluez + - bluez-libs + - bluez-mesh + - wpan-tools + - kernel-tools + - libgpiod-utils + - podman + - container-selinux + - skopeo + - criu + - slirp4netns + - clevis + - clevis-dracut + - clevis-luks + - attr + - grub2 + - grub2-efi-x64 + - efibootmgr + - shim-x64 + - microcode_ctl + - iwl1000-firmware + - iwl100-firmware + - iwl105-firmware + - iwl135-firmware + - iwl2000-firmware + - iwl2030-firmware + - iwl3160-firmware + - iwl5000-firmware + - iwl5150-firmware + - iwl6000-firmware + - iwl6050-firmware + - iwl7260-firmware + excludes: + - dracut-config-rescue + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.systemd + options: + enabled_services: + - NetworkManager.service + - firewalld.service + - rngd.service + - sshd.service + - 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: + mpp-format-string: '{ref}' + os_version: + mpp-format-string: '{version}' + - name: anaconda-tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $relver + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$relver/$relver-$arch-fedora-$snapshot/ + packages: + - anaconda + - anaconda-widgets + - kexec-tools-anaconda-addon + - anaconda-install-env-deps + - dnf + - rpm-ostree + - ostree + - pigz + - kernel + - kernel-modules + - kernel-modules-extra + - grubby + - b43-openfwwf + - glibc-all-langpacks + - grub2-tools-efi + - efibootmgr + - shim-x64 + - grub2-efi-x64-cdboot + - shim-ia32 + - grub2-efi-ia32-cdboot + - biosdevname + - memtest86+ + - syslinux + - grub2-tools + - grub2-tools-minimal + - grub2-tools-extra + - plymouth + - anaconda-dracut + - dracut-network + - dracut-config-generic + - initscripts + - cryptsetup + - rpcbind + - kbd + - kbd-misc + - tar + - xz + - curl + - bzip2 + - systemd-sysv + - systemd-units + - rsyslog + - xorg-x11-drivers + - xorg-x11-server-Xorg + - xrandr + - xrdb + - xorg-x11-xauth + - xorg-x11-xauth + - dbus-x11 + - metacity + - gsettings-desktop-schemas + - nm-connection-editor + - librsvg2 + - btrfs-progs + - jfsutils + - xfsprogs + - reiserfs-utils + - gfs2-utils + - ntfs-3g + - ntfsprogs + - system-storage-manager + - device-mapper-persistent-data + - xfsdump + - udisks2 + - udisks2-iscsi + - hostname + - libblockdev-lvm-dbus + - volume_key + - nss-tools + - selinux-policy-targeted + - audit + - ethtool + - openssh-server + - nfs-utils + - openssh-clients + - tigervnc-server-minimal + - tigervnc-server-module + - net-tools + - bridge-utils + - nmap-ncat + - pciutils + - usbutils + - ipmitool + - mt-st + - smartmontools + - hdparm + - pcmciautils + - libmlx4 + - rdma-core + - rng-tools + - dmidecode + - aajohan-comfortaa-fonts + - abattis-cantarell-fonts + - bitmap-fangsongti-fonts + - dejavu-sans-fonts + - dejavu-sans-mono-fonts + - google-noto-sans-cjk-ttc-fonts + - google-noto-sans-gurmukhi-fonts + - google-noto-sans-sinhala-vf-fonts + - jomolhari-fonts + - khmeros-base-fonts + - lohit-assamese-fonts + - lohit-bengali-fonts + - lohit-devanagari-fonts + - lohit-gujarati-fonts + - lohit-kannada-fonts + - lohit-marathi-fonts + - lohit-odia-fonts + - lohit-tamil-fonts + - lohit-telugu-fonts + - madan-fonts + - paktype-naskh-basic-fonts + - sil-abyssinica-fonts + - sil-padauk-fonts + - sil-scheherazade-fonts + - smc-meera-fonts + - thai-scalable-waree-fonts + - xorg-x11-fonts-misc + - gdb-gdbserver + - libreport-plugin-bugzilla + - libreport-plugin-reportuploader + - fpaste + - python3-pyatspi + - vim-minimal + - strace + - lsof + - dump + - xz + - less + - wget + - rsync + - bind-utils + - ftp + - mtr + - vconfig + - icfg + - spice-vdagent + - gdisk + - hexedit + - sg3_utils + - notification-daemon + 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" + exclude: + docs: true + disable_dracut: true + - type: org.osbuild.buildstamp + options: + arch: + mpp-format-string: '{arch}' + product: Fedora-IoT + version: + mpp-format-string: '{version}' + variant: osbuild + final: true + bugurl: https://github.com/gicmo/ostree-osbuild-demo/issues + - type: org.osbuild.dracut + options: + kernel: + - mpp-format-string: '{rpms[''ostree-tree''][''kernel''].evra}' + add_modules: + - anaconda + - convertfs + - dmsquash-live + - livenet + - pollcdrom + - qemu + - qemu-net + install: + - /.buildstamp + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.users + options: + users: + root: + password: '' + install: + uid: 0 + gid: 0 + home: /root + shell: /usr/libexec/anaconda/run-anaconda + password: '' + - type: org.osbuild.anaconda + options: + kickstart-modules: + - org.fedoraproject.Anaconda.Modules.Network + - org.fedoraproject.Anaconda.Modules.Payloads + - org.fedoraproject.Anaconda.Modules.Storage + - org.fedoraproject.Anaconda.Modules.Users + - type: org.osbuild.lorax-script + options: + path: 99-generic/runtime-postinstall.tmpl + basearch: + mpp-format-string: '{arch}' + - name: rootfs-image + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: LiveOS + - type: org.osbuild.truncate + options: + filename: LiveOS/rootfs.img + size: 3GB + - type: org.osbuild.mkfs.ext4 + devices: + device: + type: org.osbuild.loopback + options: + filename: LiveOS/rootfs.img + options: + label: Anaconda + uuid: 383367fa-6a09-4def-8c30-507e0b3cf1f7 + - type: org.osbuild.copy + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:anaconda-tree + options: + paths: + - from: input://tree/ + to: mount://root/ + devices: + root: + type: org.osbuild.loopback + options: + filename: LiveOS/rootfs.img + mounts: + - name: root + type: org.osbuild.ext4 + source: root + target: / + - name: efiboot-tree + build: name:build + stages: + - type: org.osbuild.grub2.iso + options: + product: + name: Fedora-IoT + version: + mpp-format-string: '{version}' + isolabel: + mpp-format-string: '{isolabel}' + kernel: + dir: /images/pxeboot + opts: + - mpp-format-string: inst.ks=hd:LABEL={isolabel}:/install.ks + architectures: + - IA32 + - X64 + vendor: fedora + - name: bootiso-tree + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: images + - path: images/pxeboot + - type: org.osbuild.copy + inputs: + base: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:anaconda-tree + options: + paths: + - from: + mpp-format-string: input://base/boot/vmlinuz-{rpms['anaconda-tree']['kernel'].evra} + to: tree:///images/pxeboot/vmlinuz + - from: + mpp-format-string: input://base/boot/initramfs-{rpms['anaconda-tree']['kernel'].evra}.img + to: tree:///images/pxeboot/initrd.img + - type: org.osbuild.squashfs + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:rootfs-image + options: + filename: images/install.img + compression: + method: lz4 + - type: org.osbuild.isolinux + inputs: + data: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:anaconda-tree + options: + product: + name: Fedora-IoT + version: + mpp-format-string: '{version}' + kernel: + dir: /images/pxeboot + opts: + - mpp-format-string: inst.ks=hd:LABEL={isolabel}:/install.ks + - type: org.osbuild.truncate + options: + filename: images/efiboot.img + size: 20MB + - type: org.osbuild.mkfs.fat + devices: + device: + type: org.osbuild.loopback + options: + filename: images/efiboot.img + options: + label: ANACONDA + volid: 7B7795E7 + - type: org.osbuild.copy + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:efiboot-tree + options: + paths: + - from: input://tree/ + to: mount://efi/ + devices: + efi: + type: org.osbuild.loopback + options: + filename: images/efiboot.img + mounts: + - name: efi + type: org.osbuild.fat + source: efi + target: / + - type: org.osbuild.copy + inputs: + base: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:efiboot-tree + options: + paths: + - from: input://base/EFI + to: tree:/// + - type: org.osbuild.ostree.init + options: + path: /ostree + - type: org.osbuild.ostree.pull + options: + repo: /ostree + inputs: + commits: + type: org.osbuild.ostree + origin: org.osbuild.pipeline + references: + name:ostree-commit: + ref: + mpp-format-string: '{ref}' + - type: org.osbuild.kickstart + options: + path: install.ks + ostree: + osname: fedora + url: file:///run/install/repo/ostree + ref: + mpp-format-string: '{ref}' + gpg: false + users: + core: + password: edge + groups: + - wheel + - type: org.osbuild.discinfo + options: + basearch: + mpp-format-string: '{arch}' + release: 202010217.n.0 + - name: bootiso + build: name:build + stages: + - type: org.osbuild.xorrisofs + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:bootiso-tree + options: + filename: fedora-ostree-boot.iso + volid: + mpp-format-string: '{isolabel}' + boot: + image: isolinux/isolinux.bin + catalog: isolinux/boot.cat + efi: images/efiboot.img + isohybridmbr: /usr/share/syslinux/isohdpfx.bin + - type: org.osbuild.implantisomd5 + options: + filename: fedora-ostree-boot.iso diff --git a/test/data/manifests/fedora-ostree-commit.mpp.yaml b/test/data/manifests/fedora-ostree-commit.mpp.yaml index eb9990cc..af268ae4 100644 --- a/test/data/manifests/fedora-ostree-commit.mpp.yaml +++ b/test/data/manifests/fedora-ostree-commit.mpp.yaml @@ -1,171 +1,106 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 36, - "releasever": "f$release", - "snapshot": "20220617", - "updates": "20220801" - }, - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "fedora-build-v2.mpp.yaml", - "id": "build" - }, - "runner": { - "mpp-format-string": "org.osbuild.fedora{release}" - } - }, - { - "name": "ostree-tree", - "build": "name:build", - "source-epoch": 1659397331, - "stages": [ - { - "type": "org.osbuild.rpm.macros", - "options": { - "filename": "/usr/lib/rpm/macros.d/macros.osbuild", - "macros": { - "_dbpath": "/usr/share/rpm" - } - } - }, - { - "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" - ], - "dbpath": "/usr/share/rpm", - "ostree_booted": true - }, - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "releasever": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - }, - { - "id": "modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/" - }, - { - "id": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/" - }, - { - "id": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/" - } - ], - "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.systemd", - "options": { - "enabled_services": [ - "cloud-config", - "cloud-final", - "cloud-init", - "cloud-init-local" - ] - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-persistent.conf", - "config": { - "Journal": { - "Storage": "persistent" - } - } - } - }, - { - "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": { - "mpp-format-string": "{release}" - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 36 + releasever: f$release + snapshot: '20220617' + updates: '20220801' +version: '2' +pipelines: + - mpp-import-pipeline: + path: fedora-build-v2.mpp.yaml + id: build + runner: + mpp-format-string: org.osbuild.fedora{release} + - name: ostree-tree + build: name:build + source-epoch: 1659397331 + stages: + - type: org.osbuild.rpm.macros + options: + filename: /usr/lib/rpm/macros.d/macros.osbuild + macros: + _dbpath: /usr/share/rpm + - 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" + dbpath: /usr/share/rpm + ostree_booted: true + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + releasever: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + - id: modular + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/ + - id: updates + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/ + - id: updates-modular + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/ + 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.systemd + options: + enabled_services: + - cloud-config + - cloud-final + - cloud-init + - cloud-init-local + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.systemd-journald + options: + filename: 10-persistent.conf + config: + Journal: + Storage: persistent + - 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: + mpp-format-string: '{release}' diff --git a/test/data/manifests/fedora-ostree-container.mpp.yaml b/test/data/manifests/fedora-ostree-container.mpp.yaml index c4aca503..e01b8619 100644 --- a/test/data/manifests/fedora-ostree-container.mpp.yaml +++ b/test/data/manifests/fedora-ostree-container.mpp.yaml @@ -1,246 +1,155 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "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", - "dracut-config-generic", - "grub2-pc", - "kernel-core", - "langpacks-en", - "nss-altfiles", - "ostree", - "polkit", - "rpm-ostree", - "selinux-policy-targeted", - "systemd-udev" - ], - "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": "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": "container-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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-container", - "bash", - "coreutils", - "glibc-minimal-langpack", - "rpm", - "shadow-utils", - "sssd-client", - "util-linux", - - "microdnf", - - "httpd" - ], - "excludes": [ - "kernel", - "dosfstools", - "e2fsprogs", - "fuse-libs", - "gnupg2-smime", - "libss", - "pinentry", - "shared-mime-info", - "trousers", - "xkeyboard-config", - "grubby" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - } - ] - }, - { - "name": "container-ostree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.ostree.init", - "options": { - "path": "/var/www/html/repo" - } - }, - { - "type": "org.osbuild.ostree.pull", - "options": { - "repo": "/var/www/html/repo" - }, - "inputs": { - "commits": { - "type": "org.osbuild.ostree", - "origin": "org.osbuild.pipeline", - "references": { - "name:ostree-commit": { - "ref": "fedora/x86_64/osbuild" - } - } - } - } - } - ] - }, - { - "name": "container", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.oci-archive", - "inputs": { - "base": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:container-tree" - ] - }, - "layer.1": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:container-ostree" - ] - } - }, - "options": { - "architecture": "amd64", - "filename": "fedora-container.tar", - "config": { - "Cmd": [ - "httpd", - "-D", "FOREGROUND" - ], - "ExposedPorts": [ - "80" - ] - }, - "annotations": { - "org.osbuild.ostree.repo": "/var/www/html/repo", - "org.osbuild.ostree.ref": "fedora/x86_64/osbuild", - "org.osbuild.ostree.layer": "1" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - 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 + - dracut-config-generic + - grub2-pc + - kernel-core + - langpacks-en + - nss-altfiles + - ostree + - polkit + - rpm-ostree + - selinux-policy-targeted + - systemd-udev + 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: 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: container-tree + build: name:build + stages: + - type: org.osbuild.rpm + 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-container + - bash + - coreutils + - glibc-minimal-langpack + - rpm + - shadow-utils + - sssd-client + - util-linux + - microdnf + - httpd + excludes: + - kernel + - dosfstools + - e2fsprogs + - fuse-libs + - gnupg2-smime + - libss + - pinentry + - shared-mime-info + - trousers + - xkeyboard-config + - grubby + 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" + exclude: + docs: true + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - name: container-ostree + build: name:build + stages: + - type: org.osbuild.ostree.init + options: + path: /var/www/html/repo + - type: org.osbuild.ostree.pull + options: + repo: /var/www/html/repo + inputs: + commits: + type: org.osbuild.ostree + origin: org.osbuild.pipeline + references: + name:ostree-commit: + ref: fedora/x86_64/osbuild + - name: container + build: name:build + stages: + - type: org.osbuild.oci-archive + inputs: + base: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:container-tree + layer.1: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:container-ostree + options: + architecture: amd64 + filename: fedora-container.tar + config: + Cmd: + - httpd + - -D + - FOREGROUND + ExposedPorts: + - '80' + annotations: + org.osbuild.ostree.repo: /var/www/html/repo + org.osbuild.ostree.ref: fedora/x86_64/osbuild + org.osbuild.ostree.layer: '1' diff --git a/test/data/manifests/fedora-ostree-image.mpp.yaml b/test/data/manifests/fedora-ostree-image.mpp.yaml index ff510583..b8abe5d5 100644 --- a/test/data/manifests/fedora-ostree-image.mpp.yaml +++ b/test/data/manifests/fedora-ostree-image.mpp.yaml @@ -1,563 +1,354 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 36, - "releasever": "f$release", - "snapshot": "20220617", - "updates": "20220801" - }, - "version": "2", - "mpp-define-image": { - "id": "image", - "size": "10737418240", - "table": { - "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0", - "label": "gpt", - "partitions": [ - { - "id": "bios-boot", - "size": 2048, - "type": "21686148-6449-6E6F-744E-656564454649", - "bootable": true, - "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" - }, - { - "id": "efi", - "size": 204800, - "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" - }, - { - "id": "boot", - "size": 204800, - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32" - }, - { - "id": "luks", - "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC" - } - ] - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "fedora-build-v2.mpp.yaml", - "id": "build" - }, - "runner": { - "mpp-format-string": "org.osbuild.fedora{release}" - } - }, - { - "mpp-import-pipelines": { - "path": "fedora-ostree-commit.mpp.yaml", - "ids": [ - "ostree-tree", - "ostree-commit" - ] - } - }, - { - "name": "image-tree", - "build": "name:build", - "source-epoch": 1659397331, - "stages": [ - { - "type": "org.osbuild.ostree.init-fs" - }, - { - "type": "org.osbuild.ostree.pull", - "options": { - "repo": "/ostree/repo", - "remote": "osbuild" - }, - "inputs": { - "commits": { - "type": "org.osbuild.ostree", - "origin": "org.osbuild.pipeline", - "references": { - "name:ostree-commit": { - "ref": "fedora/x86_64/osbuild" - } - } - } - } - }, - { - "type": "org.osbuild.ostree.os-init", - "options": { - "osname": "fedora" - } - }, - { - "type": "org.osbuild.ostree.config", - "options": { - "repo": "/ostree/repo", - "config": { - "sysroot": { - "readonly": true, - "bootloader": "none" - } - } - } - }, - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "/boot/efi", - "mode": 448 - } - ] - } - }, - { - "type": "org.osbuild.ostree.deploy", - "options": { - "osname": "fedora", - "ref": "fedora/x86_64/osbuild", - "remote": "osbuild", - "mounts": [ - "/boot", - "/boot/efi" - ], - "rootfs": { - "label": "root" - }, - "kernel_opts": [ - "rw", - "console=tty0", - "console=ttyS0", - "systemd.log_target=console", - "systemd.journald.forward_to_console=1", - "luks.uuid=aedd1eef-f24e-425e-a9f3-bb5a1c996a95" - ] - } - }, - { - "type": "org.osbuild.ostree.fillvar", - "options": { - "deployment": { - "osname": "fedora", - "ref": "fedora/x86_64/osbuild" - } - } - }, - { - "type": "org.osbuild.fstab", - "mounts": [ - { - "type": "org.osbuild.ostree.deployment", - "name": "ostree.deployment", - "options": { - "deployment": { - "osname": "fedora", - "ref": "fedora/x86_64/osbuild" - } - } - } - ], - "options": { - "filesystems": [ - { - "label": "boot", - "vfs_type": "ext4", - "path": "/boot", - "freq": 1, - "passno": 1 - }, - { - "label": "root", - "vfs_type": "xfs", - "path": "/", - "freq": 1, - "passno": 1 - }, - { - "label": "ESP", - "vfs_type": "vfat", - "path": "/boot/efi", - "options": "umask=0077,shortname=winnt", - "freq": 0, - "passno": 2 - } - ] - } - }, - { - "type": "org.osbuild.ostree.selinux", - "options": { - "deployment": { - "osname": "fedora", - "ref": "fedora/x86_64/osbuild" - } - } - }, - { - "type": "org.osbuild.grub2", - "options": { - "rootfs": { - "label": "root" - }, - "bootfs": { - "label": "boot" - }, - "uefi": { - "vendor": "fedora", - "install": true - }, - "legacy": "i386-pc", - "write_defaults": false, - "greenboot": true - } - } - ] - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": { - "mpp-format-string": "{image.size}" - } - } - }, - { - "type": "org.osbuild.sfdisk", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - }, - "options": { - "mpp-format-json": "{image.layout}" - } - }, - { - "type": "org.osbuild.mkfs.fat", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['efi'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['efi'].size}" - }, - "lock": true - } - } - }, - "options": { - "label": "ESP", - "volid": "7B7795E7" - } - }, - { - "type": "org.osbuild.mkfs.ext4", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['boot'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['boot'].size}" - }, - "lock": true - } - } - }, - "options": { - "uuid": "156f0420-627b-4151-ae6f-fda298097515", - "label": "boot" - } - }, - { - "type": "org.osbuild.luks2.format", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['luks'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['luks'].size}" - }, - "lock": true - } - } - }, - "options": { - "passphrase": "osbuild", - "uuid": "aedd1eef-f24e-425e-a9f3-bb5a1c996a95", - "label": "luks", - "pbkdf": { - "method": "argon2i", - "memory": 32, - "parallelism": 1, - "iterations": 4 - } - } - }, - { - "type": "org.osbuild.lvm2.create", - "devices": { - "luks": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['luks'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['luks'].size}" - } - } - }, - "device": { - "type": "org.osbuild.luks2", - "parent": "luks", - "options": { - "passphrase": "osbuild" - } - } - }, - "options": { - "volumes": [ - { - "name": "root", - "extents": "100%FREE" - } - ] - } - }, - { - "type": "org.osbuild.mkfs.xfs", - "devices": { - "luks": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['luks'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['luks'].size}" - } - } - }, - "lvm": { - "type": "org.osbuild.luks2", - "parent": "luks", - "options": { - "passphrase": "osbuild" - } - }, - "device": { - "type": "org.osbuild.lvm2.lv", - "parent": "lvm", - "options": { - "volume": "root" - } - } - }, - "options": { - "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "label": "root" - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:image-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://tree/", - "to": "mount://root/" - } - ] - }, - "devices": { - "efi": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['efi'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['efi'].size}" - } - } - }, - "boot": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['boot'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['boot'].size}" - } - } - }, - "luks": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['luks'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['luks'].size}" - } - } - }, - "lvm": { - "type": "org.osbuild.luks2", - "parent": "luks", - "options": { - "passphrase": "osbuild" - } - }, - "root": { - "type": "org.osbuild.lvm2.lv", - "parent": "lvm", - "options": { - "volume": "root" - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.xfs", - "source": "root", - "target": "/" - }, - { - "name": "boot", - "type": "org.osbuild.ext4", - "source": "boot", - "target": "/boot" - }, - { - "name": "efi", - "type": "org.osbuild.fat", - "source": "efi", - "target": "/boot/efi" - } - ] - }, - { - "type": "org.osbuild.grub2.inst", - "options": { - "platform": "i386-pc", - "filename": "disk.img", - "location": { - "mpp-format-int": "{image.layout['bios-boot'].start}" - }, - "core": { - "type": "mkimage", - "partlabel": "gpt", - "filesystem": "ext4" - }, - "prefix": { - "type": "partition", - "partlabel": { - "mpp-format-string": "{image.layout.label}" - }, - "number": { - "mpp-format-int": "{image.layout['boot'].index}" - }, - "path": "/grub2" - } - } - }, - { - "type": "org.osbuild.lvm2.metadata", - "devices": { - "luks": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['luks'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['luks'].size}" - } - } - }, - "device": { - "type": "org.osbuild.luks2", - "parent": "luks", - "options": { - "passphrase": "osbuild" - } - } - }, - "options": { - "vg_name": "osbuild", - "creation_host": "osbuild", - "description": "Built with osbuild" - } - } - ] - }, - { - "name": "qcow2", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "disk.img" - } - } - } - }, - "options": { - "filename": "disk.qcow2", - "format": { - "type": "qcow2", - "compat": "1.1" - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 36 + releasever: f$release + snapshot: '20220617' + updates: '20220801' +version: '2' +mpp-define-image: + id: image + size: '10737418240' + table: + uuid: D209C89E-EA5E-4FBD-B161-B461CCE297E0 + label: gpt + partitions: + - id: bios-boot + size: 2048 + type: 21686148-6449-6E6F-744E-656564454649 + bootable: true + uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549 + - id: efi + size: 204800 + type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B + uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33 + - id: boot + size: 204800 + type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + uuid: 61B2905B-DF3E-4FB3-80FA-49D1E773AA32 + - id: luks + type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + uuid: CA7D7CCB-63ED-4C53-861C-1742536059CC +pipelines: + - mpp-import-pipeline: + path: fedora-build-v2.mpp.yaml + id: build + runner: + mpp-format-string: org.osbuild.fedora{release} + - mpp-import-pipelines: + path: fedora-ostree-commit.mpp.yaml + ids: + - ostree-tree + - ostree-commit + - name: image-tree + build: name:build + source-epoch: 1659397331 + stages: + - type: org.osbuild.ostree.init-fs + - type: org.osbuild.ostree.pull + options: + repo: /ostree/repo + remote: osbuild + inputs: + commits: + type: org.osbuild.ostree + origin: org.osbuild.pipeline + references: + name:ostree-commit: + ref: fedora/x86_64/osbuild + - type: org.osbuild.ostree.os-init + options: + osname: fedora + - type: org.osbuild.ostree.config + options: + repo: /ostree/repo + config: + sysroot: + readonly: true + bootloader: none + - type: org.osbuild.mkdir + options: + paths: + - path: /boot/efi + mode: 448 + - type: org.osbuild.ostree.deploy + options: + osname: fedora + ref: fedora/x86_64/osbuild + remote: osbuild + mounts: + - /boot + - /boot/efi + rootfs: + label: root + kernel_opts: + - rw + - console=tty0 + - console=ttyS0 + - systemd.log_target=console + - systemd.journald.forward_to_console=1 + - luks.uuid=aedd1eef-f24e-425e-a9f3-bb5a1c996a95 + - type: org.osbuild.ostree.fillvar + options: + deployment: + osname: fedora + ref: fedora/x86_64/osbuild + - type: org.osbuild.fstab + mounts: + - type: org.osbuild.ostree.deployment + name: ostree.deployment + options: + deployment: + osname: fedora + ref: fedora/x86_64/osbuild + options: + filesystems: + - label: boot + vfs_type: ext4 + path: /boot + freq: 1 + passno: 1 + - label: root + vfs_type: xfs + path: / + freq: 1 + passno: 1 + - label: ESP + vfs_type: vfat + path: /boot/efi + options: umask=0077,shortname=winnt + freq: 0 + passno: 2 + - type: org.osbuild.ostree.selinux + options: + deployment: + osname: fedora + ref: fedora/x86_64/osbuild + - type: org.osbuild.grub2 + options: + rootfs: + label: root + bootfs: + label: boot + uefi: + vendor: fedora + install: true + legacy: i386-pc + write_defaults: false + greenboot: true + - name: image + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: + mpp-format-string: '{image.size}' + - type: org.osbuild.sfdisk + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + options: + mpp-format-json: '{image.layout}' + - type: org.osbuild.mkfs.fat + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''efi''].start}' + size: + mpp-format-int: '{image.layout[''efi''].size}' + lock: true + options: + label: ESP + volid: 7B7795E7 + - type: org.osbuild.mkfs.ext4 + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''boot''].start}' + size: + mpp-format-int: '{image.layout[''boot''].size}' + lock: true + options: + uuid: 156f0420-627b-4151-ae6f-fda298097515 + label: boot + - type: org.osbuild.luks2.format + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''luks''].start}' + size: + mpp-format-int: '{image.layout[''luks''].size}' + lock: true + options: + passphrase: osbuild + uuid: aedd1eef-f24e-425e-a9f3-bb5a1c996a95 + label: luks + pbkdf: + method: argon2i + memory: 32 + parallelism: 1 + iterations: 4 + - type: org.osbuild.lvm2.create + devices: + luks: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''luks''].start}' + size: + mpp-format-int: '{image.layout[''luks''].size}' + device: + type: org.osbuild.luks2 + parent: luks + options: + passphrase: osbuild + options: + volumes: + - name: root + extents: 100%FREE + - type: org.osbuild.mkfs.xfs + devices: + luks: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''luks''].start}' + size: + mpp-format-int: '{image.layout[''luks''].size}' + lvm: + type: org.osbuild.luks2 + parent: luks + options: + passphrase: osbuild + device: + type: org.osbuild.lvm2.lv + parent: lvm + options: + volume: root + options: + uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + label: root + - type: org.osbuild.copy + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:image-tree + options: + paths: + - from: input://tree/ + to: mount://root/ + devices: + efi: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''efi''].start}' + size: + mpp-format-int: '{image.layout[''efi''].size}' + boot: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''boot''].start}' + size: + mpp-format-int: '{image.layout[''boot''].size}' + luks: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''luks''].start}' + size: + mpp-format-int: '{image.layout[''luks''].size}' + lvm: + type: org.osbuild.luks2 + parent: luks + options: + passphrase: osbuild + root: + type: org.osbuild.lvm2.lv + parent: lvm + options: + volume: root + mounts: + - name: root + type: org.osbuild.xfs + source: root + target: / + - name: boot + type: org.osbuild.ext4 + source: boot + target: /boot + - name: efi + type: org.osbuild.fat + source: efi + target: /boot/efi + - type: org.osbuild.grub2.inst + options: + platform: i386-pc + filename: disk.img + location: + mpp-format-int: '{image.layout[''bios-boot''].start}' + core: + type: mkimage + partlabel: gpt + filesystem: ext4 + prefix: + type: partition + partlabel: + mpp-format-string: '{image.layout.label}' + number: + mpp-format-int: '{image.layout[''boot''].index}' + path: /grub2 + - type: org.osbuild.lvm2.metadata + devices: + luks: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''luks''].start}' + size: + mpp-format-int: '{image.layout[''luks''].size}' + device: + type: org.osbuild.luks2 + parent: luks + options: + passphrase: osbuild + options: + vg_name: osbuild + creation_host: osbuild + description: Built with osbuild + - name: qcow2 + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: disk.img + options: + filename: disk.qcow2 + format: + type: qcow2 + compat: '1.1' diff --git a/test/data/manifests/fedora-ostree-native-container.mpp.yaml b/test/data/manifests/fedora-ostree-native-container.mpp.yaml index 4156121b..3755bbb0 100644 --- a/test/data/manifests/fedora-ostree-native-container.mpp.yaml +++ b/test/data/manifests/fedora-ostree-native-container.mpp.yaml @@ -1,52 +1,31 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 36, - "releasever": "f$release", - "snapshot": "20220617", - "updates": "20220715" - }, - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "fedora-build-v2.mpp.yaml", - "id": "build" - }, - "runner": { - "mpp-format-string": "org.osbuild.fedora{release}" - } - }, - { - "mpp-import-pipelines": { - "path": "fedora-ostree-commit.mpp.yaml", - "ids": [ - "ostree-tree", - "ostree-commit" - ] - } - }, - { - "name": "container", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.ostree.encapsulate", - "options": { - "filename": "ostree-container.tar", - "max_layers": 1 - }, - "inputs": { - "commit": { - "type": "org.osbuild.ostree", - "origin": "org.osbuild.pipeline", - "references": { - "name:ostree-commit": {} - } - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 36 + releasever: f$release + snapshot: '20220617' + updates: '20220715' +version: '2' +pipelines: + - mpp-import-pipeline: + path: fedora-build-v2.mpp.yaml + id: build + runner: + mpp-format-string: org.osbuild.fedora{release} + - mpp-import-pipelines: + path: fedora-ostree-commit.mpp.yaml + ids: + - ostree-tree + - ostree-commit + - name: container + build: name:build + stages: + - type: org.osbuild.ostree.encapsulate + options: + filename: ostree-container.tar + max_layers: 1 + inputs: + commit: + type: org.osbuild.ostree + origin: org.osbuild.pipeline + references: + name:ostree-commit: {} diff --git a/test/data/manifests/fedora-ostree-tarball.mpp.yaml b/test/data/manifests/fedora-ostree-tarball.mpp.yaml index 9ca01629..e9807679 100644 --- a/test/data/manifests/fedora-ostree-tarball.mpp.yaml +++ b/test/data/manifests/fedora-ostree-tarball.mpp.yaml @@ -1,161 +1,96 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "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", - "dracut-config-generic", - "grub2-pc", - "kernel-core", - "langpacks-en", - "nss-altfiles", - "ostree", - "polkit", - "rpm-ostree", - "selinux-policy-targeted", - "systemd-udev" - ], - "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": "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": "tarball-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.ostree.init", - "options": { - "path": "/repo" - } - }, - { - "type": "org.osbuild.ostree.pull", - "options": { - "repo": "/repo" - }, - "inputs": { - "commits": { - "type": "org.osbuild.ostree", - "origin": "org.osbuild.pipeline", - "references": { - "name:ostree-commit": { - "ref": "fedora/x86_64/osbuild" - } - } - } - } - } - ] - }, - { - "name": "tarball", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.tar", - "options": { - "filename": "fedora-commit.tar", - "acls": false, - "selinux": false, - "xattrs": false - }, - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": { - "name:tarball-tree": {} - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - 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 + - dracut-config-generic + - grub2-pc + - kernel-core + - langpacks-en + - nss-altfiles + - ostree + - polkit + - rpm-ostree + - selinux-policy-targeted + - systemd-udev + 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: 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: tarball-tree + build: name:build + stages: + - type: org.osbuild.ostree.init + options: + path: /repo + - type: org.osbuild.ostree.pull + options: + repo: /repo + inputs: + commits: + type: org.osbuild.ostree + origin: org.osbuild.pipeline + references: + name:ostree-commit: + ref: fedora/x86_64/osbuild + - name: tarball + build: name:build + stages: + - type: org.osbuild.tar + options: + filename: fedora-commit.tar + acls: false + selinux: false + xattrs: false + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + name:tarball-tree: {} diff --git a/test/data/manifests/fedora-uki.mpp.yaml b/test/data/manifests/fedora-uki.mpp.yaml index 4090ac9a..7252f582 100644 --- a/test/data/manifests/fedora-uki.mpp.yaml +++ b/test/data/manifests/fedora-uki.mpp.yaml @@ -1,260 +1,168 @@ -{ - "version": "2", - "mpp-vars": { - "arch": "x86_64", - "release": 36, - "releasever": "f$release", - "snapshot": "20220617", - "updates": "20220801" - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "fedora-build-v2.mpp.yaml", - "id": "build" - }, - "runner": { - "mpp-format-string": "org.osbuild.fedora{release}" - } - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "releasever": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - }, - { - "id": "modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/" - }, - { - "id": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/" - }, - { - "id": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/" - } - ], - "packages": [ - "dnf", - "rpm-ostree", - "ostree", - "pigz", - "kernel", - "kernel-modules", - "kernel-modules-extra", - "glibc-all-langpacks", - "grub2-tools-efi", - "efibootmgr", - "shim-x64", - "grub2-efi-x64-cdboot", - "shim-ia32", - "grub2-efi-ia32-cdboot", - "biosdevname", - "memtest86+", - "syslinux", - "grub2-tools", - "grub2-tools-minimal", - "grub2-tools-extra", - "dracut", - "anaconda-dracut", - "dracut-network", - "dracut-config-generic", - "initscripts", - "cryptsetup", - "rpcbind", - "kbd", - "kbd-misc", - "tar", - "xz", - "curl", - "bzip2", - "systemd-sysv", - "systemd-units", - "rsyslog", - "fcoe-utils", - "net-tools", - "nfs-utils" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - }, - "disable_dracut": true - } - }, - { - "type": "org.osbuild.dracut", - "options": { - "kernel": [ - { - "mpp-format-string": "{rpms['tree']['kernel'].evra}" - } - ], - "add_modules": [ - "convertfs", - "dmsquash-live", - "livenet", - "pollcdrom", - "qemu", - "qemu-net" - ] - } - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "root": { - "password": "" - } - } - } - } - ] - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.squashfs", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:tree" - ] - } - }, - "options": { - "filename": "rootfs.img", - "compression": { - "method": "lz4" - } - } - } - ] - }, - { - "name": "initrd", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.gunzip", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree": { - "file": { - "mpp-format-string": "/boot/initramfs-{rpms['tree']['kernel'].evra}.img" - } - } - } - } - }, - "options": { - "path": "initramfs.img" - } - }, - { - "type": "org.osbuild.cpio.out", - "options": { - "filename": "initramfs.img", - "append": true - }, - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:image" - ] - } - } - } - ] - }, - { - "name": "uki", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.uki", - "options": { - "filename": "linux.efi", - "kernel": { - "opts": [ - "root=live:/rootfs.img" - ] - } - }, - "inputs": { - "kernel": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree": { - "file": { - "mpp-format-string": "/boot/vmlinuz-{rpms['tree']['kernel'].evra}" - } - } - } - }, - "initrd": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:initrd": { - "file": { - "mpp-format-string": "/initramfs.img" - } - } - } - }, - "osrel": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree": { - "file": { - "mpp-format-string": "/etc/os-release" - } - } - } - } - } - } - ] - } - ] -} +version: '2' +mpp-vars: + arch: x86_64 + release: 36 + releasever: f$release + snapshot: '20220617' + updates: '20220801' +pipelines: + - mpp-import-pipeline: + path: fedora-build-v2.mpp.yaml + id: build + runner: + mpp-format-string: org.osbuild.fedora{release} + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + releasever: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + - id: modular + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-modular-$snapshot/ + - id: updates + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/ + - id: updates-modular + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-modular-$updates/ + packages: + - dnf + - rpm-ostree + - ostree + - pigz + - kernel + - kernel-modules + - kernel-modules-extra + - glibc-all-langpacks + - grub2-tools-efi + - efibootmgr + - shim-x64 + - grub2-efi-x64-cdboot + - shim-ia32 + - grub2-efi-ia32-cdboot + - biosdevname + - memtest86+ + - syslinux + - grub2-tools + - grub2-tools-minimal + - grub2-tools-extra + - dracut + - anaconda-dracut + - dracut-network + - dracut-config-generic + - initscripts + - cryptsetup + - rpcbind + - kbd + - kbd-misc + - tar + - xz + - curl + - bzip2 + - systemd-sysv + - systemd-units + - rsyslog + - fcoe-utils + - net-tools + - nfs-utils + 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" + exclude: + docs: true + disable_dracut: true + - type: org.osbuild.dracut + options: + kernel: + - mpp-format-string: '{rpms[''tree''][''kernel''].evra}' + add_modules: + - convertfs + - dmsquash-live + - livenet + - pollcdrom + - qemu + - qemu-net + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.users + options: + users: + root: + password: '' + - name: image + build: name:build + stages: + - type: org.osbuild.squashfs + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:tree + options: + filename: rootfs.img + compression: + method: lz4 + - name: initrd + build: name:build + stages: + - type: org.osbuild.gunzip + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree: + file: + mpp-format-string: /boot/initramfs-{rpms['tree']['kernel'].evra}.img + options: + path: initramfs.img + - type: org.osbuild.cpio.out + options: + filename: initramfs.img + append: true + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:image + - name: uki + build: name:build + stages: + - type: org.osbuild.uki + options: + filename: linux.efi + kernel: + opts: + - root=live:/rootfs.img + inputs: + kernel: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree: + file: + mpp-format-string: /boot/vmlinuz-{rpms['tree']['kernel'].evra} + initrd: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:initrd: + file: + mpp-format-string: /initramfs.img + osrel: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree: + file: + mpp-format-string: /etc/os-release diff --git a/test/data/manifests/filesystem.mpp.yaml b/test/data/manifests/filesystem.mpp.yaml index 2953a7b7..3aba3bd5 100644 --- a/test/data/manifests/filesystem.mpp.yaml +++ b/test/data/manifests/filesystem.mpp.yaml @@ -1,40 +1,22 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "f34-build.json" - }, - "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/" - } - ], - "packages": [ - "filesystem", - "selinux-policy-targeted" - ] - } - } - }, - { - "name": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: f34-build.json + 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/ + packages: + - filesystem + - selinux-policy-targeted + - name: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts diff --git a/test/data/manifests/rhel/el7-build.mpp.yaml b/test/data/manifests/rhel/el7-build.mpp.yaml index aa3a450f..2c9c4097 100644 --- a/test/data/manifests/rhel/el7-build.mpp.yaml +++ b/test/data/manifests/rhel/el7-build.mpp.yaml @@ -1,67 +1,45 @@ -{ - "version": "2", - "pipelines": [ - { - "name": "build", - "stages": [ - { - "type": "org.osbuild.rpm", - "options": { - "gpgkeys": [ - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niLkCDQRbMtt1ARAA1lNsWklhS9LoBdolTVtg65FfdFJr47pzKRGYIoGLbcJ155ND\nG+P8UrM06E/ah06EEWuvu2YyyYAz1iYGsCwHAXtbEJh+1tF0iOVx2vnZPgtIGE9V\nP95V5ZvWvB3bdke1z8HadDA+/Ve7fbwXXLa/z9QhSQgsJ8NS8KYnDDjI4EvQtv0i\nPVLY8+u8z6VyiV9RJyn8UEZEJdbFDF9AZAT8103w8SEo/cvIoUbVKZLGcXdAIjCa\ny04u6jsrMp9UGHZX7+srT+9YHDzQixei4IdmxUcqtiNR2/bFHpHCu1pzYjXj968D\n8Ng2txBXDgs16BF/9l++GWKz2dOSH0jdS6sFJ/Dmg7oYnJ2xKSJEmcnV8Z0M1n4w\nXR1t/KeKZe3aR+RXCAEVC5dQ3GbRW2+WboJ6ldgFcVcOv6iOSWP9TrLzFPOpCsIr\nnHE+cMBmPHq3dUm7KeYXQ6wWWmtXlw6widf7cBcGFeELpuU9klzqdKze8qo2oMkf\nrfxIq8zdciPxZXb/75dGWs6dLHQmDpo4MdQVskw5vvwHicMpUpGpxkX7X1XAfdQf\nyIHLGT4ZXuMLIMUPdzJE0Vwt/RtJrZ+feLSv/+0CkkpGHORYroGwIBrJ2RikgcV2\nbc98V/27Kz2ngUCEwnmlhIcrY4IGAAZzUAl0GLHSevPbAREu4fDW4Y+ztOsAEQEA\nAYkCHwQYAQIACQUCWzLbdQIbDAAKCRD3b2bD1AgnkusfD/9U4sPtZfMw6cII167A\nXRZOO195G7oiAnBUw5AW6EK0SAHVZcuW0LMMXnGe9f4UsEUgCNwo5mvLWPxzKqFq\n6/G3kEZVFwZ0qrlLoJPeHNbOcfkeZ9NgD/OhzQmdylM0IwGM9DMrm2YS4EVsmm2b\n53qKIfIyysp1yAGcTnBwBbZ85osNBl2KRDIPhMs0bnmGB7IAvwlSb+xm6vWKECkO\nlwQDO5Kg8YZ8+Z3pn/oS688t/fPXvWLZYUqwR63oWfIaPJI7Ahv2jJmgw1ofL81r\n2CE3T/OydtUeGLzqWJAB8sbUgT3ug0cjtxsHuroQBSYBND3XDb/EQh5GeVVnGKKH\ngESLFAoweoNjDSXrlIu1gFjCDHF4CqBRmNYKrNQjLmhCrSfwkytXESJwlLzFKY8P\nK1yZyTpDC9YK0G7qgrk7EHmH9JAZTQ5V65pp0vR9KvqTU5ewkQDIljD2f3FIqo2B\nSKNCQE+N6NjWaTeNlU75m+yZocKObSPg0zS8FAuSJetNtzXA7ouqk34OoIMQj4gq\nUnh/i1FcZAd4U6Dtr9aRZ6PeLlm6MJ/h582L6fJLNEu136UWDtJj5eBYEzX13l+d\nSC4PEHx7ZZRwQKptl9NkinLZGJztg175paUu8C34sAv+SQnM20c0pdOXAq9GKKhi\nvt61kpkXoRGxjTlc6h+69aidSg==\n=ls8J\n-----END PGP PUBLIC KEY BLOCK-----\n" - ], - "exclude": { - "docs": true - } - }, - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "7", - "repos": [ - { - "id": "os", - "baseurl": "http://download.eng.brq.redhat.com/rhel-7/nightly/updates/RHEL-7/latest-RHEL-7.9/compose/Server/x86_64/os/" - } - ], - "packages": [ - "dosfstools", - "e2fsprogs", - "grub2-efi-x64", - "grub2-pc-modules", - "grub2-pc", - "lvm2", - "parted", - "policycoreutils", - "python3", - "qemu-img", - "rpm", - "selinux-policy-targeted", - "shim-x64", - "systemd", - "tar", - "util-linux", - "xfsprogs", - "xz" - ] - } - } - } - }, - { - "type": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts", - "labels": { - "/usr/bin/cp": "system_u:object_r:install_exec_t:s0", - "/usr/bin/tar": "system_u:object_r:install_exec_t:s0" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - name: build + stages: + - type: org.osbuild.rpm + options: + gpgkeys: + - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niLkCDQRbMtt1ARAA1lNsWklhS9LoBdolTVtg65FfdFJr47pzKRGYIoGLbcJ155ND\nG+P8UrM06E/ah06EEWuvu2YyyYAz1iYGsCwHAXtbEJh+1tF0iOVx2vnZPgtIGE9V\nP95V5ZvWvB3bdke1z8HadDA+/Ve7fbwXXLa/z9QhSQgsJ8NS8KYnDDjI4EvQtv0i\nPVLY8+u8z6VyiV9RJyn8UEZEJdbFDF9AZAT8103w8SEo/cvIoUbVKZLGcXdAIjCa\ny04u6jsrMp9UGHZX7+srT+9YHDzQixei4IdmxUcqtiNR2/bFHpHCu1pzYjXj968D\n8Ng2txBXDgs16BF/9l++GWKz2dOSH0jdS6sFJ/Dmg7oYnJ2xKSJEmcnV8Z0M1n4w\nXR1t/KeKZe3aR+RXCAEVC5dQ3GbRW2+WboJ6ldgFcVcOv6iOSWP9TrLzFPOpCsIr\nnHE+cMBmPHq3dUm7KeYXQ6wWWmtXlw6widf7cBcGFeELpuU9klzqdKze8qo2oMkf\nrfxIq8zdciPxZXb/75dGWs6dLHQmDpo4MdQVskw5vvwHicMpUpGpxkX7X1XAfdQf\nyIHLGT4ZXuMLIMUPdzJE0Vwt/RtJrZ+feLSv/+0CkkpGHORYroGwIBrJ2RikgcV2\nbc98V/27Kz2ngUCEwnmlhIcrY4IGAAZzUAl0GLHSevPbAREu4fDW4Y+ztOsAEQEA\nAYkCHwQYAQIACQUCWzLbdQIbDAAKCRD3b2bD1AgnkusfD/9U4sPtZfMw6cII167A\nXRZOO195G7oiAnBUw5AW6EK0SAHVZcuW0LMMXnGe9f4UsEUgCNwo5mvLWPxzKqFq\n6/G3kEZVFwZ0qrlLoJPeHNbOcfkeZ9NgD/OhzQmdylM0IwGM9DMrm2YS4EVsmm2b\n53qKIfIyysp1yAGcTnBwBbZ85osNBl2KRDIPhMs0bnmGB7IAvwlSb+xm6vWKECkO\nlwQDO5Kg8YZ8+Z3pn/oS688t/fPXvWLZYUqwR63oWfIaPJI7Ahv2jJmgw1ofL81r\n2CE3T/OydtUeGLzqWJAB8sbUgT3ug0cjtxsHuroQBSYBND3XDb/EQh5GeVVnGKKH\ngESLFAoweoNjDSXrlIu1gFjCDHF4CqBRmNYKrNQjLmhCrSfwkytXESJwlLzFKY8P\nK1yZyTpDC9YK0G7qgrk7EHmH9JAZTQ5V65pp0vR9KvqTU5ewkQDIljD2f3FIqo2B\nSKNCQE+N6NjWaTeNlU75m+yZocKObSPg0zS8FAuSJetNtzXA7ouqk34OoIMQj4gq\nUnh/i1FcZAd4U6Dtr9aRZ6PeLlm6MJ/h582L6fJLNEu136UWDtJj5eBYEzX13l+d\nSC4PEHx7ZZRwQKptl9NkinLZGJztg175paUu8C34sAv+SQnM20c0pdOXAq9GKKhi\nvt61kpkXoRGxjTlc6h+69aidSg==\n=ls8J\n-----END PGP PUBLIC KEY BLOCK-----\n" + exclude: + docs: true + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: '7' + repos: + - id: os + baseurl: http://download.eng.brq.redhat.com/rhel-7/nightly/updates/RHEL-7/latest-RHEL-7.9/compose/Server/x86_64/os/ + packages: + - dosfstools + - e2fsprogs + - grub2-efi-x64 + - grub2-pc-modules + - grub2-pc + - lvm2 + - parted + - policycoreutils + - python3 + - qemu-img + - rpm + - selinux-policy-targeted + - shim-x64 + - systemd + - tar + - util-linux + - xfsprogs + - xz + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0 diff --git a/test/data/manifests/rhel/el7-qcow2.mpp.yaml b/test/data/manifests/rhel/el7-qcow2.mpp.yaml index 5bfb56bf..a6a46492 100644 --- a/test/data/manifests/rhel/el7-qcow2.mpp.yaml +++ b/test/data/manifests/rhel/el7-qcow2.mpp.yaml @@ -1,562 +1,362 @@ -{ - "version": "2", - "mpp-define-image": { - "id": "image", - "size": "10737418240", - "table": { - "uuid": "50ED4083-6F86-4793-9092-1336C9903E86", - "label": "gpt", - "partitions": [ - { - "id": "efi", - "bootable": true, - "size": 1024000, - "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" - }, - { - "id": "boot", - "size": 1024000, - "uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32" - }, - { - "id": "bios-boot", - "size": 4096, - "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" - }, - { - "id": "lvm", - "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" - } - ] - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "el7-build.json", - "id": "build" - }, - "runner": "org.osbuild.rhel7" - }, - { - "name": "image-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "options": { - "gpgkeys": [ - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niLkCDQRbMtt1ARAA1lNsWklhS9LoBdolTVtg65FfdFJr47pzKRGYIoGLbcJ155ND\nG+P8UrM06E/ah06EEWuvu2YyyYAz1iYGsCwHAXtbEJh+1tF0iOVx2vnZPgtIGE9V\nP95V5ZvWvB3bdke1z8HadDA+/Ve7fbwXXLa/z9QhSQgsJ8NS8KYnDDjI4EvQtv0i\nPVLY8+u8z6VyiV9RJyn8UEZEJdbFDF9AZAT8103w8SEo/cvIoUbVKZLGcXdAIjCa\ny04u6jsrMp9UGHZX7+srT+9YHDzQixei4IdmxUcqtiNR2/bFHpHCu1pzYjXj968D\n8Ng2txBXDgs16BF/9l++GWKz2dOSH0jdS6sFJ/Dmg7oYnJ2xKSJEmcnV8Z0M1n4w\nXR1t/KeKZe3aR+RXCAEVC5dQ3GbRW2+WboJ6ldgFcVcOv6iOSWP9TrLzFPOpCsIr\nnHE+cMBmPHq3dUm7KeYXQ6wWWmtXlw6widf7cBcGFeELpuU9klzqdKze8qo2oMkf\nrfxIq8zdciPxZXb/75dGWs6dLHQmDpo4MdQVskw5vvwHicMpUpGpxkX7X1XAfdQf\nyIHLGT4ZXuMLIMUPdzJE0Vwt/RtJrZ+feLSv/+0CkkpGHORYroGwIBrJ2RikgcV2\nbc98V/27Kz2ngUCEwnmlhIcrY4IGAAZzUAl0GLHSevPbAREu4fDW4Y+ztOsAEQEA\nAYkCHwQYAQIACQUCWzLbdQIbDAAKCRD3b2bD1AgnkusfD/9U4sPtZfMw6cII167A\nXRZOO195G7oiAnBUw5AW6EK0SAHVZcuW0LMMXnGe9f4UsEUgCNwo5mvLWPxzKqFq\n6/G3kEZVFwZ0qrlLoJPeHNbOcfkeZ9NgD/OhzQmdylM0IwGM9DMrm2YS4EVsmm2b\n53qKIfIyysp1yAGcTnBwBbZ85osNBl2KRDIPhMs0bnmGB7IAvwlSb+xm6vWKECkO\nlwQDO5Kg8YZ8+Z3pn/oS688t/fPXvWLZYUqwR63oWfIaPJI7Ahv2jJmgw1ofL81r\n2CE3T/OydtUeGLzqWJAB8sbUgT3ug0cjtxsHuroQBSYBND3XDb/EQh5GeVVnGKKH\ngESLFAoweoNjDSXrlIu1gFjCDHF4CqBRmNYKrNQjLmhCrSfwkytXESJwlLzFKY8P\nK1yZyTpDC9YK0G7qgrk7EHmH9JAZTQ5V65pp0vR9KvqTU5ewkQDIljD2f3FIqo2B\nSKNCQE+N6NjWaTeNlU75m+yZocKObSPg0zS8FAuSJetNtzXA7ouqk34OoIMQj4gq\nUnh/i1FcZAd4U6Dtr9aRZ6PeLlm6MJ/h582L6fJLNEu136UWDtJj5eBYEzX13l+d\nSC4PEHx7ZZRwQKptl9NkinLZGJztg175paUu8C34sAv+SQnM20c0pdOXAq9GKKhi\nvt61kpkXoRGxjTlc6h+69aidSg==\n=ls8J\n-----END PGP PUBLIC KEY BLOCK-----\n" - ], - "exclude": { - "docs": true - } - }, - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "7", - "repos": [ - { - "id": "os", - "baseurl": "http://download.eng.brq.redhat.com/rhel-7/nightly/updates/RHEL-7/latest-RHEL-7.9/compose/Server/x86_64/os/" - } - ], - "packages": [ - "@core", - "lvm2", - "grub2-efi-x64", - "shim-x64", - "kernel", - "nfs-utils", - "yum-utils", - "cloud-init", - "rhn-setup", - "yum-rhn-plugin", - "cloud-utils-growpart", - "dracut-config-generic", - "dracut-norescue", - "firewalld", - "tar", - "tcpdump", - "rsync" - ], - "excludes": [ - "aic94xx-firmware", - "alsa-firmware", - "alsa-lib", - "alsa-tools-firmware", - "ivtv-firmware", - "iwl1000-firmware", - "iwl100-firmware", - "iwl105-firmware", - "iwl135-firmware", - "iwl2000-firmware", - "iwl2030-firmware", - "iwl3160-firmware", - "iwl3945-firmware", - "iwl4965-firmware", - "iwl5000-firmware", - "iwl5150-firmware", - "iwl6000-firmware", - "iwl6000g2a-firmware", - "iwl6000g2b-firmware", - "iwl6050-firmware", - "iwl7260-firmware", - "libertas-sd8686-firmware", - "libertas-sd8787-firmware", - "libertas-usb8388-firmware" - ] - } - } - } - }, - { - "type": "org.osbuild.fix-bls", - "options": {} - }, - { - "type": "org.osbuild.locale", - "options": { - "language": "en_US.UTF-8" - } - }, - { - "type": "org.osbuild.timezone", - "options": { - "zone": "America/New_York" - } - }, - { - "type": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "NetworkManager.service", - "cloud-config", - "cloud-final", - "cloud-init", - "cloud-init-local", - "firewalld.service", - "sshd.service" - ] - } - }, - { - "type": "org.osbuild.fstab", - "options": { - "filesystems": [ - { - "label": "boot", - "vfs_type": "xfs", - "path": "/boot", - "freq": 1, - "passno": 1 - }, - { - "label": "ESP", - "vfs_type": "vfat", - "path": "/boot/efi", - "options": "umask=0077,shortname=winnt", - "freq": 0, - "passno": 2 - }, - { - "label": "root", - "vfs_type": "xfs", - "path": "/", - "freq": 1, - "passno": 1 - } - ] - } - }, - { - "type": "org.osbuild.grub2.legacy", - "options": { - "architecture": "x64", - "rootfs": { - "device": "/dev/mapper/rootvg-rootlv" - }, - "bootfs": { - "uuid": "156f0420-627b-4151-ae6f-fda298097515" - }, - "bios": "i386-pc", - "uefi": { - "vendor": "redhat" - }, - "entries": [ - { - "id": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "default": true, - "product": { - "name": "Red Hat Enterprise Linux Server", - "version": "7.9", - "nick": "Maipo" - }, - "kernel": { - "mpp-format-string": "{rpms['image-tree']['kernel'].evra}" - } - }, - { - "id": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "product": { - "name": "Red Hat Enterprise Linux Server", - "version": "7.9", - "nick": "Maipo" - }, - "kernel": "0-rescue-ffffffffffffffffffffffffffffffff" - } - ], - "config": { - "cmdline": "ro crashkernel=auto console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300 scsi_mod.use_blk_mq=y enforcing=0", - "distributor": "$(sed 's, release .*$,,g' /etc/system-release)", - "serial": "serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1", - "terminal_input": [ - "serial", - "console" - ], - "terminal_output": [ - "serial", - "console" - ] - } - } - }, - { - "type": "org.osbuild.selinux", - "options": { - "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts" - } - } - ] - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": { - "mpp-format-string": "{image.size}" - } - } - }, - { - "type": "org.osbuild.parted", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - }, - "options": { - "label": "gpt", - "partitions": [ - { - "start": { - "mpp-format-int": "{image.layout['efi'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['efi'].size}" - }, - "bootable": true, - "name": "EFI System Partition" - }, - { - "start": { - "mpp-format-int": "{image.layout['boot'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['boot'].size}" - }, - "name": "boot" - }, - { - "start": { - "mpp-format-int": "{image.layout['bios-boot'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['bios-boot'].size}" - }, - "type": "bios_grub", - "name": "BIOS boot" - }, - { - "start": { - "mpp-format-int": "{image.layout['lvm'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['lvm'].size}" - }, - "type": "lvm", - "name": "LVM" - } - ] - } - }, - { - "type": "org.osbuild.mkfs.fat", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['efi'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['efi'].size}" - } - } - } - }, - "options": { - "label": "ESP", - "volid": "7B7795E7" - } - }, - { - "type": "org.osbuild.mkfs.xfs", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['boot'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['boot'].size}" - } - } - } - }, - "options": { - "uuid": "156f0420-627b-4151-ae6f-fda298097515", - "label": "boot" - } - }, - { - "type": "org.osbuild.lvm2.create", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['lvm'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['lvm'].size}" - } - } - } - }, - "options": { - "volumes": [ - { - "name": "rootlv", - "size": "100%FREE" - } - ] - } - }, - { - "type": "org.osbuild.mkfs.xfs", - "devices": { - "lvm": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['lvm'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['lvm'].size}" - } - } - }, - "device": { - "type": "org.osbuild.lvm2.lv", - "parent": "lvm", - "options": { - "volume": "rootlv" - } - } - }, - "options": { - "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "label": "root" - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:image-tree" - ] - } - }, - "options": { - "paths": [ - { - "from": "input://tree/", - "to": "mount://root/" - } - ] - }, - "devices": { - "efi": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['efi'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['efi'].size}" - } - } - }, - "boot": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['boot'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['boot'].size}" - } - } - }, - "lvm": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['lvm'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['lvm'].size}" - } - } - }, - "root": { - "type": "org.osbuild.lvm2.lv", - "parent": "lvm", - "options": { - "volume": "rootlv" - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.xfs", - "source": "root", - "target": "/" - }, - { - "name": "boot", - "type": "org.osbuild.xfs", - "source": "boot", - "target": "/boot" - }, - { - "name": "efi", - "type": "org.osbuild.fat", - "source": "efi", - "target": "/boot/efi" - } - ] - }, - { - "type": "org.osbuild.grub2.inst", - "options": { - "platform": "i386-pc", - "filename": "disk.img", - "location": { - "mpp-format-int": "{image.layout['bios-boot'].start}" - }, - "core": { - "type": "mkimage", - "partlabel": "gpt", - "filesystem": "xfs" - }, - "prefix": { - "type": "partition", - "partlabel": { - "mpp-format-string": "{image.layout.label}" - }, - "number": { - "mpp-format-int": "{image.layout['boot'].index}" - }, - "path": "/grub2" - } - } - }, - { - "type": "org.osbuild.lvm2.metadata", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img", - "start": { - "mpp-format-int": "{image.layout['lvm'].start}" - }, - "size": { - "mpp-format-int": "{image.layout['lvm'].size}" - }, - "lock": true - } - } - }, - "options": { - "vg_name": "rootvg", - "creation_host": "osbuild", - "description": "Built with osbuild" - } - } - ] - }, - { - "name": "qcow2", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "disk.img" - } - } - } - }, - "options": { - "filename": "disk.qcow2", - "format": { - "type": "qcow2", - "compat": "0.10" - } - } - } - ] - } - ] -} +version: '2' +mpp-define-image: + id: image + size: '10737418240' + table: + uuid: 50ED4083-6F86-4793-9092-1336C9903E86 + label: gpt + partitions: + - id: efi + bootable: true + size: 1024000 + uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33 + - id: boot + size: 1024000 + uuid: 61B2905B-DF3E-4FB3-80FA-49D1E773AA32 + - id: bios-boot + size: 4096 + uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549 + - id: lvm + uuid: 6264D520-3FB9-423F-8AB8-7A0A8E3D3562 +pipelines: + - mpp-import-pipeline: + path: el7-build.json + id: build + runner: org.osbuild.rhel7 + - name: image-tree + build: name:build + stages: + - type: org.osbuild.rpm + options: + gpgkeys: + - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niLkCDQRbMtt1ARAA1lNsWklhS9LoBdolTVtg65FfdFJr47pzKRGYIoGLbcJ155ND\nG+P8UrM06E/ah06EEWuvu2YyyYAz1iYGsCwHAXtbEJh+1tF0iOVx2vnZPgtIGE9V\nP95V5ZvWvB3bdke1z8HadDA+/Ve7fbwXXLa/z9QhSQgsJ8NS8KYnDDjI4EvQtv0i\nPVLY8+u8z6VyiV9RJyn8UEZEJdbFDF9AZAT8103w8SEo/cvIoUbVKZLGcXdAIjCa\ny04u6jsrMp9UGHZX7+srT+9YHDzQixei4IdmxUcqtiNR2/bFHpHCu1pzYjXj968D\n8Ng2txBXDgs16BF/9l++GWKz2dOSH0jdS6sFJ/Dmg7oYnJ2xKSJEmcnV8Z0M1n4w\nXR1t/KeKZe3aR+RXCAEVC5dQ3GbRW2+WboJ6ldgFcVcOv6iOSWP9TrLzFPOpCsIr\nnHE+cMBmPHq3dUm7KeYXQ6wWWmtXlw6widf7cBcGFeELpuU9klzqdKze8qo2oMkf\nrfxIq8zdciPxZXb/75dGWs6dLHQmDpo4MdQVskw5vvwHicMpUpGpxkX7X1XAfdQf\nyIHLGT4ZXuMLIMUPdzJE0Vwt/RtJrZ+feLSv/+0CkkpGHORYroGwIBrJ2RikgcV2\nbc98V/27Kz2ngUCEwnmlhIcrY4IGAAZzUAl0GLHSevPbAREu4fDW4Y+ztOsAEQEA\nAYkCHwQYAQIACQUCWzLbdQIbDAAKCRD3b2bD1AgnkusfD/9U4sPtZfMw6cII167A\nXRZOO195G7oiAnBUw5AW6EK0SAHVZcuW0LMMXnGe9f4UsEUgCNwo5mvLWPxzKqFq\n6/G3kEZVFwZ0qrlLoJPeHNbOcfkeZ9NgD/OhzQmdylM0IwGM9DMrm2YS4EVsmm2b\n53qKIfIyysp1yAGcTnBwBbZ85osNBl2KRDIPhMs0bnmGB7IAvwlSb+xm6vWKECkO\nlwQDO5Kg8YZ8+Z3pn/oS688t/fPXvWLZYUqwR63oWfIaPJI7Ahv2jJmgw1ofL81r\n2CE3T/OydtUeGLzqWJAB8sbUgT3ug0cjtxsHuroQBSYBND3XDb/EQh5GeVVnGKKH\ngESLFAoweoNjDSXrlIu1gFjCDHF4CqBRmNYKrNQjLmhCrSfwkytXESJwlLzFKY8P\nK1yZyTpDC9YK0G7qgrk7EHmH9JAZTQ5V65pp0vR9KvqTU5ewkQDIljD2f3FIqo2B\nSKNCQE+N6NjWaTeNlU75m+yZocKObSPg0zS8FAuSJetNtzXA7ouqk34OoIMQj4gq\nUnh/i1FcZAd4U6Dtr9aRZ6PeLlm6MJ/h582L6fJLNEu136UWDtJj5eBYEzX13l+d\nSC4PEHx7ZZRwQKptl9NkinLZGJztg175paUu8C34sAv+SQnM20c0pdOXAq9GKKhi\nvt61kpkXoRGxjTlc6h+69aidSg==\n=ls8J\n-----END PGP PUBLIC KEY BLOCK-----\n" + exclude: + docs: true + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: '7' + repos: + - id: os + baseurl: http://download.eng.brq.redhat.com/rhel-7/nightly/updates/RHEL-7/latest-RHEL-7.9/compose/Server/x86_64/os/ + packages: + - '@core' + - lvm2 + - grub2-efi-x64 + - shim-x64 + - kernel + - nfs-utils + - yum-utils + - cloud-init + - rhn-setup + - yum-rhn-plugin + - cloud-utils-growpart + - dracut-config-generic + - dracut-norescue + - firewalld + - tar + - tcpdump + - rsync + excludes: + - aic94xx-firmware + - alsa-firmware + - alsa-lib + - alsa-tools-firmware + - ivtv-firmware + - iwl1000-firmware + - iwl100-firmware + - iwl105-firmware + - iwl135-firmware + - iwl2000-firmware + - iwl2030-firmware + - iwl3160-firmware + - iwl3945-firmware + - iwl4965-firmware + - iwl5000-firmware + - iwl5150-firmware + - iwl6000-firmware + - iwl6000g2a-firmware + - iwl6000g2b-firmware + - iwl6050-firmware + - iwl7260-firmware + - libertas-sd8686-firmware + - libertas-sd8787-firmware + - libertas-usb8388-firmware + - type: org.osbuild.fix-bls + options: {} + - type: org.osbuild.locale + options: + language: en_US.UTF-8 + - type: org.osbuild.timezone + options: + zone: America/New_York + - type: org.osbuild.systemd + options: + enabled_services: + - NetworkManager.service + - cloud-config + - cloud-final + - cloud-init + - cloud-init-local + - firewalld.service + - sshd.service + - type: org.osbuild.fstab + options: + filesystems: + - label: boot + vfs_type: xfs + path: /boot + freq: 1 + passno: 1 + - label: ESP + vfs_type: vfat + path: /boot/efi + options: umask=0077,shortname=winnt + freq: 0 + passno: 2 + - label: root + vfs_type: xfs + path: / + freq: 1 + passno: 1 + - type: org.osbuild.grub2.legacy + options: + architecture: x64 + rootfs: + device: /dev/mapper/rootvg-rootlv + bootfs: + uuid: 156f0420-627b-4151-ae6f-fda298097515 + bios: i386-pc + uefi: + vendor: redhat + entries: + - id: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + default: true + product: + name: Red Hat Enterprise Linux Server + version: '7.9' + nick: Maipo + kernel: + mpp-format-string: '{rpms[''image-tree''][''kernel''].evra}' + - id: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + product: + name: Red Hat Enterprise Linux Server + version: '7.9' + nick: Maipo + kernel: 0-rescue-ffffffffffffffffffffffffffffffff + config: + cmdline: ro crashkernel=auto console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300 scsi_mod.use_blk_mq=y enforcing=0 + distributor: $(sed 's, release .*$,,g' /etc/system-release) + serial: serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 + terminal_input: + - serial + - console + terminal_output: + - serial + - console + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + - name: image + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: + mpp-format-string: '{image.size}' + - type: org.osbuild.parted + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + options: + label: gpt + partitions: + - start: + mpp-format-int: '{image.layout[''efi''].start}' + size: + mpp-format-int: '{image.layout[''efi''].size}' + bootable: true + name: EFI System Partition + - start: + mpp-format-int: '{image.layout[''boot''].start}' + size: + mpp-format-int: '{image.layout[''boot''].size}' + name: boot + - start: + mpp-format-int: '{image.layout[''bios-boot''].start}' + size: + mpp-format-int: '{image.layout[''bios-boot''].size}' + type: bios_grub + name: BIOS boot + - start: + mpp-format-int: '{image.layout[''lvm''].start}' + size: + mpp-format-int: '{image.layout[''lvm''].size}' + type: lvm + name: LVM + - type: org.osbuild.mkfs.fat + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''efi''].start}' + size: + mpp-format-int: '{image.layout[''efi''].size}' + options: + label: ESP + volid: 7B7795E7 + - type: org.osbuild.mkfs.xfs + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''boot''].start}' + size: + mpp-format-int: '{image.layout[''boot''].size}' + options: + uuid: 156f0420-627b-4151-ae6f-fda298097515 + label: boot + - type: org.osbuild.lvm2.create + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''lvm''].start}' + size: + mpp-format-int: '{image.layout[''lvm''].size}' + options: + volumes: + - name: rootlv + size: 100%FREE + - type: org.osbuild.mkfs.xfs + devices: + lvm: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''lvm''].start}' + size: + mpp-format-int: '{image.layout[''lvm''].size}' + device: + type: org.osbuild.lvm2.lv + parent: lvm + options: + volume: rootlv + options: + uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + label: root + - type: org.osbuild.copy + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:image-tree + options: + paths: + - from: input://tree/ + to: mount://root/ + devices: + efi: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''efi''].start}' + size: + mpp-format-int: '{image.layout[''efi''].size}' + boot: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''boot''].start}' + size: + mpp-format-int: '{image.layout[''boot''].size}' + lvm: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''lvm''].start}' + size: + mpp-format-int: '{image.layout[''lvm''].size}' + root: + type: org.osbuild.lvm2.lv + parent: lvm + options: + volume: rootlv + mounts: + - name: root + type: org.osbuild.xfs + source: root + target: / + - name: boot + type: org.osbuild.xfs + source: boot + target: /boot + - name: efi + type: org.osbuild.fat + source: efi + target: /boot/efi + - type: org.osbuild.grub2.inst + options: + platform: i386-pc + filename: disk.img + location: + mpp-format-int: '{image.layout[''bios-boot''].start}' + core: + type: mkimage + partlabel: gpt + filesystem: xfs + prefix: + type: partition + partlabel: + mpp-format-string: '{image.layout.label}' + number: + mpp-format-int: '{image.layout[''boot''].index}' + path: /grub2 + - type: org.osbuild.lvm2.metadata + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + start: + mpp-format-int: '{image.layout[''lvm''].start}' + size: + mpp-format-int: '{image.layout[''lvm''].size}' + lock: true + options: + vg_name: rootvg + creation_host: osbuild + description: Built with osbuild + - name: qcow2 + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: disk.img + options: + filename: disk.qcow2 + format: + type: qcow2 + compat: '0.10' diff --git a/test/data/stages/authconfig/a.mpp.yaml b/test/data/stages/authconfig/a.mpp.yaml index c9b556d3..a3131862 100644 --- a/test/data/stages/authconfig/a.mpp.yaml +++ b/test/data/stages/authconfig/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "authconfig" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - authconfig diff --git a/test/data/stages/authconfig/b.mpp.yaml b/test/data/stages/authconfig/b.mpp.yaml index cb1b3b7e..7278d3d1 100644 --- a/test/data/stages/authconfig/b.mpp.yaml +++ b/test/data/stages/authconfig/b.mpp.yaml @@ -1,37 +1,20 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "authconfig" - ] - } - } - }, - { - "name": "org.osbuild.authconfig" - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - authconfig + - name: org.osbuild.authconfig diff --git a/test/data/stages/authselect/a.mpp.yaml b/test/data/stages/authselect/a.mpp.yaml index 1139877e..f121444f 100644 --- a/test/data/stages/authselect/a.mpp.yaml +++ b/test/data/stages/authselect/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "authselect" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - authselect diff --git a/test/data/stages/authselect/b.mpp.yaml b/test/data/stages/authselect/b.mpp.yaml index fa82137c..4527b8b6 100644 --- a/test/data/stages/authselect/b.mpp.yaml +++ b/test/data/stages/authselect/b.mpp.yaml @@ -1,44 +1,25 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "authselect" - ] - } - } - }, - { - "name": "org.osbuild.authselect", - "options": { - "profile": "nis", - "features": [ - "with-ecryptfs", - "with-mkhomedir" - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - authselect + - name: org.osbuild.authselect + options: + profile: nis + features: + - with-ecryptfs + - with-mkhomedir diff --git a/test/data/stages/chmod/a.mpp.yaml b/test/data/stages/chmod/a.mpp.yaml index 3da95451..4ae2de35 100644 --- a/test/data/stages/chmod/a.mpp.yaml +++ b/test/data/stages/chmod/a.mpp.yaml @@ -1,48 +1,26 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": { - "encoding": "base64", - "data": "NDIK" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": {} - } - } - }, - "options": { - "paths": [ - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile" - } - ] - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: + encoding: base64 + data: NDIK +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: {} + options: + paths: + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile diff --git a/test/data/stages/chmod/b.mpp.yaml b/test/data/stages/chmod/b.mpp.yaml index 8eddd981..54e3b745 100644 --- a/test/data/stages/chmod/b.mpp.yaml +++ b/test/data/stages/chmod/b.mpp.yaml @@ -1,58 +1,31 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": { - "encoding": "base64", - "data": "NDIK" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": {} - } - } - }, - "options": { - "paths": [ - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile" - } - ] - } - }, - { - "type": "org.osbuild.chmod", - "options": { - "items": { - "/testfile": { - "mode": "a+x" - } - } - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: + encoding: base64 + data: NDIK +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: {} + options: + paths: + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile + - type: org.osbuild.chmod + options: + items: + /testfile: + mode: a+x diff --git a/test/data/stages/chown/a.mpp.yaml b/test/data/stages/chown/a.mpp.yaml index e348c727..4c27799f 100644 --- a/test/data/stages/chown/a.mpp.yaml +++ b/test/data/stages/chown/a.mpp.yaml @@ -1,126 +1,71 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": { - "encoding": "base64", - "data": "NDIK" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "setup", - "pam", - "shadow-utils" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": {} - } - } - }, - "options": { - "paths": [ - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile1" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile2" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile3" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile4" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile5" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile6" - } - ] - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "testuser": { - "uid": 2000 - } - } - } - }, - { - "type": "org.osbuild.groups", - "options": { - "groups": { - "testgroup": { - "gid": 3000 - } - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +version: '2' +sources: + org.osbuild.inline: + items: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: + encoding: base64 + data: NDIK +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + packages: + - setup + - pam + - shadow-utils + 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" + exclude: + docs: true + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: {} + options: + paths: + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile1 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile2 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile3 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile4 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile5 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile6 + - type: org.osbuild.users + options: + users: + testuser: + uid: 2000 + - type: org.osbuild.groups + options: + groups: + testgroup: + gid: 3000 diff --git a/test/data/stages/chown/b.mpp.yaml b/test/data/stages/chown/b.mpp.yaml index 8d3e941b..b828b0f1 100644 --- a/test/data/stages/chown/b.mpp.yaml +++ b/test/data/stages/chown/b.mpp.yaml @@ -1,153 +1,88 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": { - "encoding": "base64", - "data": "NDIK" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "setup", - "pam", - "shadow-utils" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": {} - } - } - }, - "options": { - "paths": [ - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile1" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile2" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile3" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile4" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile5" - }, - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile6" - } - ] - } - }, - { - "type": "org.osbuild.users", - "options": { - "users": { - "testuser": { - "uid": 2000 - } - } - } - }, - { - "type": "org.osbuild.groups", - "options": { - "groups": { - "testgroup": { - "gid": 3000 - } - } - } - }, - { - "type": "org.osbuild.chown", - "options": { - "items": { - "/testfile1": { - "user": "testuser" - }, - "/testfile2": { - "group": "testgroup" - }, - "/testfile3": { - "user": "testuser", - "group": "testgroup" - }, - "/testfile4": { - "user": 2000 - }, - "/testfile5": { - "group": 3000 - }, - "/testfile6": { - "user": 2000, - "group": 3000 - } - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +version: '2' +sources: + org.osbuild.inline: + items: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: + encoding: base64 + data: NDIK +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + packages: + - setup + - pam + - shadow-utils + 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" + exclude: + docs: true + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: {} + options: + paths: + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile1 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile2 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile3 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile4 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile5 + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile6 + - type: org.osbuild.users + options: + users: + testuser: + uid: 2000 + - type: org.osbuild.groups + options: + groups: + testgroup: + gid: 3000 + - type: org.osbuild.chown + options: + items: + /testfile1: + user: testuser + /testfile2: + group: testgroup + /testfile3: + user: testuser + group: testgroup + /testfile4: + user: 2000 + /testfile5: + group: 3000 + /testfile6: + user: 2000 + group: 3000 diff --git a/test/data/stages/chrony-servers/a.mpp.yaml b/test/data/stages/chrony-servers/a.mpp.yaml index 7865f1da..96760c25 100644 --- a/test/data/stages/chrony-servers/a.mpp.yaml +++ b/test/data/stages/chrony-servers/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "chrony" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - chrony diff --git a/test/data/stages/chrony-servers/b.mpp.yaml b/test/data/stages/chrony-servers/b.mpp.yaml index f4191593..b5df43a0 100644 --- a/test/data/stages/chrony-servers/b.mpp.yaml +++ b/test/data/stages/chrony-servers/b.mpp.yaml @@ -1,54 +1,31 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "chrony" - ] - } - } - }, - { - "name": "org.osbuild.chrony", - "options": { - "servers": [ - { - "hostname": "ntp.example.com", - "prefer": true, - "minpoll": 4, - "maxpoll": 4 - }, - { - "hostname": "ntp2.example.com", - "iburst": false, - "minpoll": 4, - "maxpoll": 4 - } - ], - "leapsectz": "" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - chrony + - name: org.osbuild.chrony + options: + servers: + - hostname: ntp.example.com + prefer: true + minpoll: 4 + maxpoll: 4 + - hostname: ntp2.example.com + iburst: false + minpoll: 4 + maxpoll: 4 + leapsectz: '' diff --git a/test/data/stages/chrony/a.mpp.yaml b/test/data/stages/chrony/a.mpp.yaml index 7865f1da..96760c25 100644 --- a/test/data/stages/chrony/a.mpp.yaml +++ b/test/data/stages/chrony/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "chrony" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - chrony diff --git a/test/data/stages/chrony/b.mpp.yaml b/test/data/stages/chrony/b.mpp.yaml index d55ef65e..8ca85732 100644 --- a/test/data/stages/chrony/b.mpp.yaml +++ b/test/data/stages/chrony/b.mpp.yaml @@ -1,43 +1,24 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "chrony" - ] - } - } - }, - { - "name": "org.osbuild.chrony", - "options": { - "timeservers": [ - "ntp.example.com", - "ntp2.example.com" - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - chrony + - name: org.osbuild.chrony + options: + timeservers: + - ntp.example.com + - ntp2.example.com diff --git a/test/data/stages/cloud-init/a.mpp.yaml b/test/data/stages/cloud-init/a.mpp.yaml index 90b0f8ec..427b42b3 100644 --- a/test/data/stages/cloud-init/a.mpp.yaml +++ b/test/data/stages/cloud-init/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "cloud-init" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - cloud-init diff --git a/test/data/stages/cloud-init/b.mpp.yaml b/test/data/stages/cloud-init/b.mpp.yaml index 070be929..c1b8cbd1 100644 --- a/test/data/stages/cloud-init/b.mpp.yaml +++ b/test/data/stages/cloud-init/b.mpp.yaml @@ -1,88 +1,50 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "cloud-init" - ] - } - } - }, - { - "name": "org.osbuild.cloud-init", - "options": { - "filename": "00-default_user.cfg", - "config": { - "system_info": { - "default_user": { - "name": "ec2-user" - } - } - } - } - }, - { - "name": "org.osbuild.cloud-init", - "options": { - "filename": "10-azure-kfp.cfg", - "config": { - "reporting": { - "logging": { - "type": "log" - }, - "telemetry": { - "type": "hyperv" - } - } - } - } - }, - { - "name": "org.osbuild.cloud-init", - "options": { - "filename": "91-azure_datasource.cfg", - "config": { - "datasource_list": ["Azure"], - "datasource": { - "Azure": { - "apply_network_config": false - } - } - } - } - }, - { - "name": "org.osbuild.cloud-init", - "options": { - "filename": "06_logging_override.cfg", - "config": { - "output": { - "all": ">> /var/log/cloud-init-all.log" - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - cloud-init + - name: org.osbuild.cloud-init + options: + filename: 00-default_user.cfg + config: + system_info: + default_user: + name: ec2-user + - name: org.osbuild.cloud-init + options: + filename: 10-azure-kfp.cfg + config: + reporting: + logging: + type: log + telemetry: + type: hyperv + - name: org.osbuild.cloud-init + options: + filename: 91-azure_datasource.cfg + config: + datasource_list: + - Azure + datasource: + Azure: + apply_network_config: false + - name: org.osbuild.cloud-init + options: + filename: 06_logging_override.cfg + config: + output: + all: '>> /var/log/cloud-init-all.log' diff --git a/test/data/stages/containers.storage.conf/a.mpp.yaml b/test/data/stages/containers.storage.conf/a.mpp.yaml index 80f2939b..1cda7bc0 100644 --- a/test/data/stages/containers.storage.conf/a.mpp.yaml +++ b/test/data/stages/containers.storage.conf/a.mpp.yaml @@ -1,41 +1,23 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "containers-common" - ] - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - containers-common diff --git a/test/data/stages/containers.storage.conf/b.mpp.yaml b/test/data/stages/containers.storage.conf/b.mpp.yaml index 105565d7..791bb59c 100644 --- a/test/data/stages/containers.storage.conf/b.mpp.yaml +++ b/test/data/stages/containers.storage.conf/b.mpp.yaml @@ -1,63 +1,36 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "containers-common" - ] - } - } - } - }, - { - "type": "org.osbuild.containers.storage.conf", - "options": { - "comment": [ - "Allow extra containers at '/usr/share/containers/storage'", - "Use 'nodev' for security and 'metacopy' to allow better", - "pagecache sharing of base-layers" - ], - "config": { - "storage": { - "options": { - "additionalimagestores": [ - "/usr/share/container/storage" - ], - "overlay": { - "mountopt": "nodev,metacopy=on" - } - } - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - containers-common + - type: org.osbuild.containers.storage.conf + options: + comment: + - Allow extra containers at '/usr/share/containers/storage' + - Use 'nodev' for security and 'metacopy' to allow better + - pagecache sharing of base-layers + config: + storage: + options: + additionalimagestores: + - /usr/share/container/storage + overlay: + mountopt: nodev,metacopy=on diff --git a/test/data/stages/copy/a.mpp.yaml b/test/data/stages/copy/a.mpp.yaml index b2e301d9..ca4b7058 100644 --- a/test/data/stages/copy/a.mpp.yaml +++ b/test/data/stages/copy/a.mpp.yaml @@ -1,84 +1,49 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": { - "encoding": "base64", - "data": "NDIK" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "fedora-release-common" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0": {} - } - } - }, - "options": { - "paths": [ - { - "from": "input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0", - "to": "tree:///testfile1" - } - ] - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +version: '2' +sources: + org.osbuild.inline: + items: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: + encoding: base64 + data: NDIK +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + packages: + - fedora-release-common + 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" + exclude: + docs: true + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0: {} + options: + paths: + - from: input://inlinefile/sha256:084c799cd551dd1d8d5c5f9a5d593b2e931f5e36122ee5c793c1d08a19839cc0 + to: tree:///testfile1 diff --git a/test/data/stages/copy/b.mpp.yaml b/test/data/stages/copy/b.mpp.yaml index be360b1b..3379df62 100644 --- a/test/data/stages/copy/b.mpp.yaml +++ b/test/data/stages/copy/b.mpp.yaml @@ -1,93 +1,54 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca": { - "encoding": "base64", - "data": "NDMK" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "$arch", - "module-platform-id": "$releasever", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/" - } - ], - "packages": [ - "fedora-release-common" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca": {} - } - } - }, - "options": { - "paths": [ - { - "from": "input://inlinefile/sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca", - "to": "tree:///testfile1" - }, - { - "from": "input://inlinefile/sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca", - "to": "tree:///etc/system-release", - "remove_destination": true - }, - { - "from": "input://inlinefile/sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca", - "to": "tree:///etc/os-release" - } - ] - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +version: '2' +sources: + org.osbuild.inline: + items: + sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca: + encoding: base64 + data: NDMK +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: $arch + module-platform-id: $releasever + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-fedora-$snapshot/ + packages: + - fedora-release-common + 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" + exclude: + docs: true + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca: {} + options: + paths: + - from: input://inlinefile/sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca + to: tree:///testfile1 + - from: input://inlinefile/sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca + to: tree:///etc/system-release + remove_destination: true + - from: input://inlinefile/sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca + to: tree:///etc/os-release diff --git a/test/data/stages/cpio.out/a.mpp.yaml b/test/data/stages/cpio.out/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/cpio.out/a.mpp.yaml +++ b/test/data/stages/cpio.out/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/cpio.out/b.mpp.yaml b/test/data/stages/cpio.out/b.mpp.yaml index 859413f1..3a202883 100644 --- a/test/data/stages/cpio.out/b.mpp.yaml +++ b/test/data/stages/cpio.out/b.mpp.yaml @@ -1,116 +1,71 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": {} - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "input-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "42", - "text": "42\n" - } - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://inlinefile/{embedded['42']}" - }, - "to": "tree:///testfile" - } - ] - } - } - ] - }, - { - "name": "append-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "hw", - "text": "# Hallo Welt\n" - } - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://inlinefile/{embedded['hw']}" - }, - "to": "tree:///Readme.md" - } - ] - } - } - ] - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.cpio.out", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:input-tree" - ] - } - }, - "options": { - "filename": "archive.img", - "root-node": "omit" - } - }, - { - "type": "org.osbuild.cpio.out", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:append-tree" - ] - } - }, - "options": { - "filename": "archive.img", - "root-node": "omit", - "append": true, - "owner": { - "user": "root", - "group": "root" - } - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: {} +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: input-tree + build: name:build + stages: + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: '42' + text: '42 + + ' + options: + paths: + - from: + mpp-format-string: input://inlinefile/{embedded['42']} + to: tree:///testfile + - name: append-tree + build: name:build + stages: + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: hw + text: '# Hallo Welt + + ' + options: + paths: + - from: + mpp-format-string: input://inlinefile/{embedded['hw']} + to: tree:///Readme.md + - name: tree + build: name:build + stages: + - type: org.osbuild.cpio.out + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:input-tree + options: + filename: archive.img + root-node: omit + - type: org.osbuild.cpio.out + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:append-tree + options: + filename: archive.img + root-node: omit + append: true + owner: + user: root + group: root diff --git a/test/data/stages/cron.script/a.mpp.yaml b/test/data/stages/cron.script/a.mpp.yaml index b85f77e8..81de4dd8 100644 --- a/test/data/stages/cron.script/a.mpp.yaml +++ b/test/data/stages/cron.script/a.mpp.yaml @@ -1,54 +1,31 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "cronie" - ] - } - } - } - }, - { - "type": "org.osbuild.cron.script", - "options": { - "filename": "osbuild", - "interval": "daily", - "simple": { - "comment": [ - "Created by osbuild" - ], - "command": "osbuild --version" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - cronie + - type: org.osbuild.cron.script + options: + filename: osbuild + interval: daily + simple: + comment: + - Created by osbuild + command: osbuild --version diff --git a/test/data/stages/cron.script/b.mpp.yaml b/test/data/stages/cron.script/b.mpp.yaml index 2a77e4cf..5f7b4518 100644 --- a/test/data/stages/cron.script/b.mpp.yaml +++ b/test/data/stages/cron.script/b.mpp.yaml @@ -1,55 +1,32 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "cronie" - ] - } - } - } - }, - { - "type": "org.osbuild.cron.script", - "options": { - "filename": "osbuild", - "interval": "daily", - "simple": { - "comment": [ - "Created by osbuild", - "and very awesome" - ], - "command": "osbuild --help" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - cronie + - type: org.osbuild.cron.script + options: + filename: osbuild + interval: daily + simple: + comment: + - Created by osbuild + - and very awesome + command: osbuild --help diff --git a/test/data/stages/dnf-automatic.config/a.mpp.yaml b/test/data/stages/dnf-automatic.config/a.mpp.yaml index 1efde3ba..db4b02d2 100644 --- a/test/data/stages/dnf-automatic.config/a.mpp.yaml +++ b/test/data/stages/dnf-automatic.config/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf-automatic" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf-automatic diff --git a/test/data/stages/dnf-automatic.config/b.mpp.yaml b/test/data/stages/dnf-automatic.config/b.mpp.yaml index d8964337..63d7d57c 100644 --- a/test/data/stages/dnf-automatic.config/b.mpp.yaml +++ b/test/data/stages/dnf-automatic.config/b.mpp.yaml @@ -1,45 +1,25 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf-automatic" - ] - } - } - }, - { - "name": "org.osbuild.dnf-automatic.config", - "options": { - "config": { - "commands": { - "apply_updates": true, - "upgrade_type": "security" - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf-automatic + - name: org.osbuild.dnf-automatic.config + options: + config: + commands: + apply_updates: true + upgrade_type: security diff --git a/test/data/stages/dnf.config/a.mpp.yaml b/test/data/stages/dnf.config/a.mpp.yaml index 1b804ed7..aa2d7b00 100644 --- a/test/data/stages/dnf.config/a.mpp.yaml +++ b/test/data/stages/dnf.config/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf diff --git a/test/data/stages/dnf.config/b.mpp.yaml b/test/data/stages/dnf.config/b.mpp.yaml index 147ace15..b71802db 100644 --- a/test/data/stages/dnf.config/b.mpp.yaml +++ b/test/data/stages/dnf.config/b.mpp.yaml @@ -1,53 +1,29 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf" - ] - } - } - }, - { - "name": "org.osbuild.dnf.config", - "options": { - "variables": [ - { - "name": "releasever", - "value": "8.4" - } - ], - "config": { - "main": { - "ip_resolve": "4", - "tsflags": [ - "nodocs" - ] - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf + - name: org.osbuild.dnf.config + options: + variables: + - name: releasever + value: '8.4' + config: + main: + ip_resolve: '4' + tsflags: + - nodocs diff --git a/test/data/stages/dracut.conf/a.mpp.yaml b/test/data/stages/dracut.conf/a.mpp.yaml index 66b7d621..a3bb300f 100644 --- a/test/data/stages/dracut.conf/a.mpp.yaml +++ b/test/data/stages/dracut.conf/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dracut" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dracut diff --git a/test/data/stages/dracut.conf/b.mpp.yaml b/test/data/stages/dracut.conf/b.mpp.yaml index 13a5eec2..a6880486 100644 --- a/test/data/stages/dracut.conf/b.mpp.yaml +++ b/test/data/stages/dracut.conf/b.mpp.yaml @@ -1,45 +1,25 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dracut" - ] - } - } - }, - { - "name": "org.osbuild.dracut.conf", - "options": { - "filename": "sgdisk.conf", - "config": { - "install_items": [ - "sgdisk" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dracut + - name: org.osbuild.dracut.conf + options: + filename: sgdisk.conf + config: + install_items: + - sgdisk diff --git a/test/data/stages/dracut/template.mpp.yaml b/test/data/stages/dracut/template.mpp.yaml index 0ae9ba8d..6d89660b 100644 --- a/test/data/stages/dracut/template.mpp.yaml +++ b/test/data/stages/dracut/template.mpp.yaml @@ -1,44 +1,25 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.rpm", - "options": { - "disable_dracut": true, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dracut", - "kernel" - ] - } - } - }, - { - "name": "org.osbuild.dracut", - "options": { - "kernel": [ - "5.11.12-300.fc34.x86_64" - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.rpm + options: + disable_dracut: true + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dracut + - kernel + - name: org.osbuild.dracut + options: + kernel: + - 5.11.12-300.fc34.x86_64 diff --git a/test/data/stages/fdo/a.mpp.yaml b/test/data/stages/fdo/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/fdo/a.mpp.yaml +++ b/test/data/stages/fdo/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/fdo/b.mpp.yaml b/test/data/stages/fdo/b.mpp.yaml index 6771c793..18b0f6fd 100644 --- a/test/data/stages/fdo/b.mpp.yaml +++ b/test/data/stages/fdo/b.mpp.yaml @@ -1,40 +1,22 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": { - "encoding": "base64", - "data": "SGFsbG8gV2VsdAo=" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.fdo", - "inputs": { - "rootcerts": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": {} - } - } - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: + encoding: base64 + data: SGFsbG8gV2VsdAo= +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.fdo + inputs: + rootcerts: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: {} diff --git a/test/data/stages/firewall/a.mpp.yaml b/test/data/stages/firewall/a.mpp.yaml index b97b9797..25fccfb6 100644 --- a/test/data/stages/firewall/a.mpp.yaml +++ b/test/data/stages/firewall/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "firewalld" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - firewalld diff --git a/test/data/stages/firewall/b.mpp.yaml b/test/data/stages/firewall/b.mpp.yaml index 11e52799..09b319ed 100644 --- a/test/data/stages/firewall/b.mpp.yaml +++ b/test/data/stages/firewall/b.mpp.yaml @@ -1,69 +1,38 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "firewalld" - ] - } - } - }, - { - "name": "org.osbuild.firewall", - "options": { - "default_zone": "trusted" - } - }, - { - "name": "org.osbuild.firewall", - "options": { - "ports": [ - "53:tcp", - "88:udp" - ], - "enabled_services": [ - "http", - "ftp" - ], - "disabled_services": [ - "telnet" - ] - } - }, - { - "name": "org.osbuild.firewall", - "options": { - "zones": [ - { - "name": "new-zone", - "sources": [ - "192.0.2.0/24" - ] - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - firewalld + - name: org.osbuild.firewall + options: + default_zone: trusted + - name: org.osbuild.firewall + options: + ports: + - 53:tcp + - 88:udp + enabled_services: + - http + - ftp + disabled_services: + - telnet + - name: org.osbuild.firewall + options: + zones: + - name: new-zone + sources: + - 192.0.2.0/24 diff --git a/test/data/stages/fstab/a.mpp.yaml b/test/data/stages/fstab/a.mpp.yaml index 9c13b342..a5486e64 100644 --- a/test/data/stages/fstab/a.mpp.yaml +++ b/test/data/stages/fstab/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "filesystem" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - filesystem diff --git a/test/data/stages/fstab/b.mpp.yaml b/test/data/stages/fstab/b.mpp.yaml index e4213812..c967d4e5 100644 --- a/test/data/stages/fstab/b.mpp.yaml +++ b/test/data/stages/fstab/b.mpp.yaml @@ -1,69 +1,42 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "filesystem" - ] - } - } - }, - { - "name": "org.osbuild.fstab", - "options": { - "filesystems": [ - { - "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "vfs_type": "ext4", - "path": "/", - "freq": 1, - "passno": 1 - }, - { - "device": "/dev/root", - "vfs_type": "ext4", - "path": "/sysroot", - "freq": 1, - "passno": 1 - }, - { - "partlabel": "THEPARTITION", - "vfs_type": "ext4", - "path": "/thepart", - "freq": 1, - "passno": 1 - }, - { - "label": "LABEL", - "vfs_type": "ext4", - "path": "/label", - "freq": 1, - "passno": 1 - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - filesystem + - name: org.osbuild.fstab + options: + filesystems: + - uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + vfs_type: ext4 + path: / + freq: 1 + passno: 1 + - device: /dev/root + vfs_type: ext4 + path: /sysroot + freq: 1 + passno: 1 + - partlabel: THEPARTITION + vfs_type: ext4 + path: /thepart + freq: 1 + passno: 1 + - label: LABEL + vfs_type: ext4 + path: /label + freq: 1 + passno: 1 diff --git a/test/data/stages/gcp.guest-agent.conf/a.mpp.yaml b/test/data/stages/gcp.guest-agent.conf/a.mpp.yaml index 1b804ed7..aa2d7b00 100644 --- a/test/data/stages/gcp.guest-agent.conf/a.mpp.yaml +++ b/test/data/stages/gcp.guest-agent.conf/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf diff --git a/test/data/stages/gcp.guest-agent.conf/b.mpp.yaml b/test/data/stages/gcp.guest-agent.conf/b.mpp.yaml index 136e46ee..71b91f77 100644 --- a/test/data/stages/gcp.guest-agent.conf/b.mpp.yaml +++ b/test/data/stages/gcp.guest-agent.conf/b.mpp.yaml @@ -1,54 +1,32 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf" - ] - } - } - }, - { - "name": "org.osbuild.gcp.guest-agent.conf", - "options": { - "config_scope": "distro", - "config": { - "Accounts": { - "gpasswd_add_cmd": "gpasswd -a {user} {group}", - "gpasswd_remove_cmd": "gpasswd -d {user} {group}" - }, - "InstanceSetup": { - "set_boto_config": false, - "host_key_types": [ - "ecdsa", - "ed25519", - "rsa" - ] - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf + - name: org.osbuild.gcp.guest-agent.conf + options: + config_scope: distro + config: + Accounts: + gpasswd_add_cmd: gpasswd -a {user} {group} + gpasswd_remove_cmd: gpasswd -d {user} {group} + InstanceSetup: + set_boto_config: false + host_key_types: + - ecdsa + - ed25519 + - rsa diff --git a/test/data/stages/groups/a.mpp.yaml b/test/data/stages/groups/a.mpp.yaml index 4d805283..5325dde9 100644 --- a/test/data/stages/groups/a.mpp.yaml +++ b/test/data/stages/groups/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "setup" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - setup diff --git a/test/data/stages/groups/b.mpp.yaml b/test/data/stages/groups/b.mpp.yaml index 84bbad56..b9a168fe 100644 --- a/test/data/stages/groups/b.mpp.yaml +++ b/test/data/stages/groups/b.mpp.yaml @@ -1,44 +1,24 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "setup" - ] - } - } - }, - { - "name": "org.osbuild.groups", - "options": { - "groups": { - "testgroup": { - "gid": 42042 - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - setup + - name: org.osbuild.groups + options: + groups: + testgroup: + gid: 42042 diff --git a/test/data/stages/grub2.legacy/a.mpp.yaml b/test/data/stages/grub2.legacy/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/grub2.legacy/a.mpp.yaml +++ b/test/data/stages/grub2.legacy/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/grub2.legacy/b.mpp.yaml b/test/data/stages/grub2.legacy/b.mpp.yaml index 1bc955e1..75290d1f 100644 --- a/test/data/stages/grub2.legacy/b.mpp.yaml +++ b/test/data/stages/grub2.legacy/b.mpp.yaml @@ -1,57 +1,35 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.grub2.legacy", - "options": { - "rootfs": { - "label": "root" - }, - "bios": { - "platform": "i386-pc" - }, - "uefi": { - "vendor": "fedora", - "install": true - }, - "config": { - "cmdline": "ro", - "timeout": 10, - "terminal_input": [ - "serial", - "console" - ], - "terminal_output": [ - "serial", - "console" - ], - "serial": "serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1" - }, - "write_defaults": true, - "entries": [ - { - "id": "fff", - "kernel": "4.18", - "product": { - "name": "Fedora", - "version": "34" - } - } - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.grub2.legacy + options: + rootfs: + label: root + bios: + platform: i386-pc + uefi: + vendor: fedora + install: true + config: + cmdline: ro + timeout: 10 + terminal_input: + - serial + - console + terminal_output: + - serial + - console + serial: serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 + write_defaults: true + entries: + - id: fff + kernel: '4.18' + product: + name: Fedora + version: '34' diff --git a/test/data/stages/grub2/a.mpp.yaml b/test/data/stages/grub2/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/grub2/a.mpp.yaml +++ b/test/data/stages/grub2/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/grub2/b.mpp.yaml b/test/data/stages/grub2/b.mpp.yaml index 0d5bad27..56763c0b 100644 --- a/test/data/stages/grub2/b.mpp.yaml +++ b/test/data/stages/grub2/b.mpp.yaml @@ -1,45 +1,28 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.grub2", - "options": { - "rootfs": { - "label": "root" - }, - "uefi": { - "vendor": "fedora", - "install": true, - "unified": true - }, - "config": { - "timeout": 10, - "terminal_input": [ - "serial", - "console" - ], - "terminal_output": [ - "serial", - "console" - ], - "serial": "serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1" - }, - "saved_entry": "fff-1.0.0", - "write_defaults": true - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.grub2 + options: + rootfs: + label: root + uefi: + vendor: fedora + install: true + unified: true + config: + timeout: 10 + terminal_input: + - serial + - console + terminal_output: + - serial + - console + serial: serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 + saved_entry: fff-1.0.0 + write_defaults: true diff --git a/test/data/stages/gunzip/a.mpp.yaml b/test/data/stages/gunzip/a.mpp.yaml index 7ff59cb4..aa72cf64 100644 --- a/test/data/stages/gunzip/a.mpp.yaml +++ b/test/data/stages/gunzip/a.mpp.yaml @@ -1,43 +1,24 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": { - "encoding": "base64", - "data": "SGFsbG8gV2VsdAo=" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.gzip", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": {} - } - } - }, - "options": { - "filename": "compressed.gz" - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: + encoding: base64 + data: SGFsbG8gV2VsdAo= +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.gzip + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: {} + options: + filename: compressed.gz diff --git a/test/data/stages/gunzip/b.mpp.yaml b/test/data/stages/gunzip/b.mpp.yaml index 0b9b8b2a..033cf1d7 100644 --- a/test/data/stages/gunzip/b.mpp.yaml +++ b/test/data/stages/gunzip/b.mpp.yaml @@ -1,66 +1,37 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": { - "encoding": "base64", - "data": "SGFsbG8gV2VsdAo=" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree-compressed", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.gzip", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": {} - } - } - }, - "options": { - "filename": "compressed.gz" - } - } - ] - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.gunzip", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:tree-compressed": { - "file": "/compressed.gz" - } - } - } - }, - "options": { - "path": "uncompressed.txt" - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: + encoding: base64 + data: SGFsbG8gV2VsdAo= +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree-compressed + build: name:build + stages: + - type: org.osbuild.gzip + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: {} + options: + filename: compressed.gz + - name: tree + build: name:build + stages: + - type: org.osbuild.gunzip + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:tree-compressed: + file: /compressed.gz + options: + path: uncompressed.txt diff --git a/test/data/stages/gzip/a.mpp.yaml b/test/data/stages/gzip/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/gzip/a.mpp.yaml +++ b/test/data/stages/gzip/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/gzip/b.mpp.yaml b/test/data/stages/gzip/b.mpp.yaml index 7ff59cb4..aa72cf64 100644 --- a/test/data/stages/gzip/b.mpp.yaml +++ b/test/data/stages/gzip/b.mpp.yaml @@ -1,43 +1,24 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": { - "encoding": "base64", - "data": "SGFsbG8gV2VsdAo=" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.gzip", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0": {} - } - } - }, - "options": { - "filename": "compressed.gz" - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: + encoding: base64 + data: SGFsbG8gV2VsdAo= +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.gzip + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:f950375066d74787f31cbd8f9f91c71819357cad243fb9d4a0d9ef4fa76709e0: {} + options: + filename: compressed.gz diff --git a/test/data/stages/hostname/a.mpp.yaml b/test/data/stages/hostname/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/hostname/a.mpp.yaml +++ b/test/data/stages/hostname/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/hostname/b.mpp.yaml b/test/data/stages/hostname/b.mpp.yaml index f76d0bf5..6cd3e874 100644 --- a/test/data/stages/hostname/b.mpp.yaml +++ b/test/data/stages/hostname/b.mpp.yaml @@ -1,40 +1,22 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.hostname", - "options": { - "hostname": "testing.hostname.local" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.hostname + options: + hostname: testing.hostname.local diff --git a/test/data/stages/kernel-cmdline/a.mpp.yaml b/test/data/stages/kernel-cmdline/a.mpp.yaml index 6075b57c..d9bfc82e 100644 --- a/test/data/stages/kernel-cmdline/a.mpp.yaml +++ b/test/data/stages/kernel-cmdline/a.mpp.yaml @@ -1,35 +1,20 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd", - "kernel" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - kernel diff --git a/test/data/stages/kernel-cmdline/b.mpp.yaml b/test/data/stages/kernel-cmdline/b.mpp.yaml index 5ad07b39..23452de1 100644 --- a/test/data/stages/kernel-cmdline/b.mpp.yaml +++ b/test/data/stages/kernel-cmdline/b.mpp.yaml @@ -1,42 +1,24 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd", - "kernel" - ] - } - } - }, - { - "name": "org.osbuild.kernel-cmdline", - "options": { - "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "kernel_opts": "net.ifnames=0 crashkernel=auto" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - kernel + - name: org.osbuild.kernel-cmdline + options: + root_fs_uuid: 76a22bf4-f153-4541-b6c7-0332c0dfaeac + kernel_opts: net.ifnames=0 crashkernel=auto diff --git a/test/data/stages/keymap/a.mpp.yaml b/test/data/stages/keymap/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/keymap/a.mpp.yaml +++ b/test/data/stages/keymap/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/keymap/b.mpp.yaml b/test/data/stages/keymap/b.mpp.yaml index cd32bbb7..b30349bb 100644 --- a/test/data/stages/keymap/b.mpp.yaml +++ b/test/data/stages/keymap/b.mpp.yaml @@ -1,46 +1,26 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.keymap", - "options": { - "keymap": "se-dvorak", - "x11-keymap": { - "layouts": [ - "cz" - ] - }, - "font": "eurlatgr" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.keymap + options: + keymap: se-dvorak + x11-keymap: + layouts: + - cz + font: eurlatgr diff --git a/test/data/stages/livesys/a.mpp.yaml b/test/data/stages/livesys/a.mpp.yaml index 9c13b342..a5486e64 100644 --- a/test/data/stages/livesys/a.mpp.yaml +++ b/test/data/stages/livesys/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "filesystem" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - filesystem diff --git a/test/data/stages/livesys/b.mpp.yaml b/test/data/stages/livesys/b.mpp.yaml index ef0b6e9e..778d4a3d 100644 --- a/test/data/stages/livesys/b.mpp.yaml +++ b/test/data/stages/livesys/b.mpp.yaml @@ -1,40 +1,22 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "filesystem" - ] - } - } - }, - { - "name": "org.osbuild.livesys", - "options": { - "livesys_session": "gnome" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - filesystem + - name: org.osbuild.livesys + options: + livesys_session: gnome diff --git a/test/data/stages/locale/a.mpp.yaml b/test/data/stages/locale/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/locale/a.mpp.yaml +++ b/test/data/stages/locale/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/locale/b.mpp.yaml b/test/data/stages/locale/b.mpp.yaml index b04121f8..31756b21 100644 --- a/test/data/stages/locale/b.mpp.yaml +++ b/test/data/stages/locale/b.mpp.yaml @@ -1,40 +1,22 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.locale", - "options": { - "language": "nn_NO.utf8" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.locale + options: + language: nn_NO.utf8 diff --git a/test/data/stages/mkdir/a.mpp.yaml b/test/data/stages/mkdir/a.mpp.yaml index 086f1cc7..1fce75d6 100644 --- a/test/data/stages/mkdir/a.mpp.yaml +++ b/test/data/stages/mkdir/a.mpp.yaml @@ -1,32 +1,15 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "a" - }, - { - "path": "c/d", - "parents": true - } - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: a + - path: c/d + parents: true diff --git a/test/data/stages/mkdir/b.mpp.yaml b/test/data/stages/mkdir/b.mpp.yaml index 3dedb7fc..83ef0551 100644 --- a/test/data/stages/mkdir/b.mpp.yaml +++ b/test/data/stages/mkdir/b.mpp.yaml @@ -1,45 +1,22 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "a" - }, - { - "path": "c/d", - "parents": true - }, - { - "path": "a/b", - "mode": 448 - }, - { - "path": "b/c/d", - "parents": true - }, - { - "path": "c", - "mode": 448, - "exist_ok": true - } - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: a + - path: c/d + parents: true + - path: a/b + mode: 448 + - path: b/c/d + parents: true + - path: c + mode: 448 + exist_ok: true diff --git a/test/data/stages/modprobe/a.mpp.yaml b/test/data/stages/modprobe/a.mpp.yaml index 141186b6..85846733 100644 --- a/test/data/stages/modprobe/a.mpp.yaml +++ b/test/data/stages/modprobe/a.mpp.yaml @@ -1,32 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": ["kmod"] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - kmod diff --git a/test/data/stages/modprobe/b.mpp.yaml b/test/data/stages/modprobe/b.mpp.yaml index ae068df6..7e955f16 100644 --- a/test/data/stages/modprobe/b.mpp.yaml +++ b/test/data/stages/modprobe/b.mpp.yaml @@ -1,75 +1,40 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "kmod" - ] - } - } - }, - { - "name": "org.osbuild.modprobe", - "options": { - "filename": "disallow-modules.conf", - "commands": [ - { - "command": "blacklist", - "modulename": "nouveau" - }, - { - "command": "blacklist", - "modulename": "floppy" - } - ] - } - }, - { - "name": "org.osbuild.modprobe", - "options": { - "filename": "disallow-additional-modules.conf", - "commands": [ - { - "command": "blacklist", - "modulename": "my-module" - } - ] - } - }, - { - "name": "org.osbuild.modprobe", - "options": { - "filename": "firewalld-sysctls.conf", - "commands": [ - { - "command": "install", - "modulename": "nf_conntrack", - "cmdline": "/usr/sbin/modprobe --ignore-install nf_conntrack $CMDLINE_OPTS && /usr/sbin/sysctl --quiet --pattern 'net[.]netfilter[.]nf_conntrack.*' --system" - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - kmod + - name: org.osbuild.modprobe + options: + filename: disallow-modules.conf + commands: + - command: blacklist + modulename: nouveau + - command: blacklist + modulename: floppy + - name: org.osbuild.modprobe + options: + filename: disallow-additional-modules.conf + commands: + - command: blacklist + modulename: my-module + - name: org.osbuild.modprobe + options: + filename: firewalld-sysctls.conf + commands: + - command: install + modulename: nf_conntrack + cmdline: /usr/sbin/modprobe --ignore-install nf_conntrack $CMDLINE_OPTS && /usr/sbin/sysctl --quiet --pattern 'net[.]netfilter[.]nf_conntrack.*' --system diff --git a/test/data/stages/nginx.conf/a.mpp.yaml b/test/data/stages/nginx.conf/a.mpp.yaml index d83ca088..bf5e7743 100644 --- a/test/data/stages/nginx.conf/a.mpp.yaml +++ b/test/data/stages/nginx.conf/a.mpp.yaml @@ -1,39 +1,23 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": ["nginx"] - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nginx diff --git a/test/data/stages/nginx.conf/b.mpp.yaml b/test/data/stages/nginx.conf/b.mpp.yaml index 3b7ac8d7..43bec32d 100644 --- a/test/data/stages/nginx.conf/b.mpp.yaml +++ b/test/data/stages/nginx.conf/b.mpp.yaml @@ -1,51 +1,31 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": ["nginx"] - } - } - } - }, - { - "type": "org.osbuild.nginx.conf", - "options": { - "path": "/etc/nginx-test.conf", - "config": { - "listen": "*:8080", - "root": "/var/www/html", - "pid": "/var/run/nginx.pid", - "daemon": false - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nginx + - type: org.osbuild.nginx.conf + options: + path: /etc/nginx-test.conf + config: + listen: '*:8080' + root: /var/www/html + pid: /var/run/nginx.pid + daemon: false diff --git a/test/data/stages/nm.conf/a.mpp.yaml b/test/data/stages/nm.conf/a.mpp.yaml index f563eefd..656295e6 100644 --- a/test/data/stages/nm.conf/a.mpp.yaml +++ b/test/data/stages/nm.conf/a.mpp.yaml @@ -1,15 +1,7 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.noop" - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.noop diff --git a/test/data/stages/nm.conf/b.mpp.yaml b/test/data/stages/nm.conf/b.mpp.yaml index 2b1b5886..c6d9e120 100644 --- a/test/data/stages/nm.conf/b.mpp.yaml +++ b/test/data/stages/nm.conf/b.mpp.yaml @@ -1,59 +1,31 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.nm.conf", - "options": { - "path": "/etc/NetworkManager/NetworkManager.conf", - "settings": { - "main": { - "plugins": [ - "keyfile" - ], - "no-auto-default": [ - "*" - ] - }, - "global-dns-domain": [ - { - "name": "*", - "config": { - "servers": [ - "8.8.8.8" - ] - } - } - ], - "device": [ - { - "config": { - "wifi.scan-rand-mac-address": false - } - } - ] - } - } - }, - { - "name": "org.osbuild.nm.conf", - "options": { - "path": "/etc/NetworkManager/conf.d/99-unmanaged-devices.conf", - "settings": { - "keyfile": { - "unmanaged-devices": [ - "interface-name:veth*", - "interface-name:starfish0" - ] - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.nm.conf + options: + path: /etc/NetworkManager/NetworkManager.conf + settings: + main: + plugins: + - keyfile + no-auto-default: + - '*' + global-dns-domain: + - name: '*' + config: + servers: + - 8.8.8.8 + device: + - config: + wifi.scan-rand-mac-address: false + - name: org.osbuild.nm.conf + options: + path: /etc/NetworkManager/conf.d/99-unmanaged-devices.conf + settings: + keyfile: + unmanaged-devices: + - interface-name:veth* + - interface-name:starfish0 diff --git a/test/data/stages/nm.conn/a.mpp.yaml b/test/data/stages/nm.conn/a.mpp.yaml index f563eefd..656295e6 100644 --- a/test/data/stages/nm.conn/a.mpp.yaml +++ b/test/data/stages/nm.conn/a.mpp.yaml @@ -1,15 +1,7 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.noop" - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.noop diff --git a/test/data/stages/nm.conn/b.mpp.yaml b/test/data/stages/nm.conn/b.mpp.yaml index 57dc8bee..74edc076 100644 --- a/test/data/stages/nm.conn/b.mpp.yaml +++ b/test/data/stages/nm.conn/b.mpp.yaml @@ -1,62 +1,40 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.nm.conn", - "options": { - "filename": "osbuild.nmconnection", - "settings": { - "connection": { - "type": "ethernet", - "id": "static-conn", - "uuid": "5fb8f75a-7fde-4906-a51e-a70e56c58742", - "interface-name": "eth0", - "autoconnect-priority": 0, - "autoconnect": true - }, - "ipv4": { - "method": "manual", - "address": [ - "10.23.0.3/24" - ] - }, - "ipv6": { - "method": "ignore" - } - } - } - }, - { - "name": "org.osbuild.nm.conn", - "options": { - "path": "/etc/NetworkManager/system-connections/test.conf", - "settings": { - "connection": { - "type": "ethernet", - "id": "static-conn", - "uuid": "6fb8f75a-7fde-4906-a51e-a70e56c58742", - "interface-name": "eth1", - "autoconnect-priority": 0, - "autoconnect": true - }, - "ipv4": { - "method": "manual", - "address": [ - "10.24.0.5/24" - ] - }, - "ipv6": { - "method": "ignore" - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.nm.conn + options: + filename: osbuild.nmconnection + settings: + connection: + type: ethernet + id: static-conn + uuid: 5fb8f75a-7fde-4906-a51e-a70e56c58742 + interface-name: eth0 + autoconnect-priority: 0 + autoconnect: true + ipv4: + method: manual + address: + - 10.23.0.3/24 + ipv6: + method: ignore + - name: org.osbuild.nm.conn + options: + path: /etc/NetworkManager/system-connections/test.conf + settings: + connection: + type: ethernet + id: static-conn + uuid: 6fb8f75a-7fde-4906-a51e-a70e56c58742 + interface-name: eth1 + autoconnect-priority: 0 + autoconnect: true + ipv4: + method: manual + address: + - 10.24.0.5/24 + ipv6: + method: ignore diff --git a/test/data/stages/oscap.autotailor/a.mpp.yaml b/test/data/stages/oscap.autotailor/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/oscap.autotailor/a.mpp.yaml +++ b/test/data/stages/oscap.autotailor/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/oscap.autotailor/b.mpp.yaml b/test/data/stages/oscap.autotailor/b.mpp.yaml index ca17561e..1bb51db4 100644 --- a/test/data/stages/oscap.autotailor/b.mpp.yaml +++ b/test/data/stages/oscap.autotailor/b.mpp.yaml @@ -1,47 +1,26 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "/usr/share/osbuild/oscap", - "parents": true - } - ] - } - }, - { - "type": "org.osbuild.oscap.autotailor", - "options": { - "filepath": "/usr/share/osbuild/oscap/tailoring.xml", - "config": { - "datastream": "/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml", - "profile_id": "xccdf_org.ssgproject.content_profile_ospp", - "new_profile": "xccdf_org.ssgproject.content_profile_ospp_osbuild_tailoring", - "selected": [ - "partition_for_var_log" - ], - "unselected": [ - "rpm_verify_hashes", - "rpm_verify_permissions" - ] - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.mkdir + options: + paths: + - path: /usr/share/osbuild/oscap + parents: true + - type: org.osbuild.oscap.autotailor + options: + filepath: /usr/share/osbuild/oscap/tailoring.xml + config: + datastream: /usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml + profile_id: xccdf_org.ssgproject.content_profile_ospp + new_profile: xccdf_org.ssgproject.content_profile_ospp_osbuild_tailoring + selected: + - partition_for_var_log + unselected: + - rpm_verify_hashes + - rpm_verify_permissions diff --git a/test/data/stages/oscap.remediation/a.mpp.yaml b/test/data/stages/oscap.remediation/a.mpp.yaml index 3b96be6a..3bad8284 100644 --- a/test/data/stages/oscap.remediation/a.mpp.yaml +++ b/test/data/stages/oscap.remediation/a.mpp.yaml @@ -1,42 +1,24 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "openscap-scanner", - "scap-security-guide" - ] - } - } - } - } - ] - } - ] -} \ No newline at end of file +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - openscap-scanner + - scap-security-guide diff --git a/test/data/stages/oscap.remediation/b.mpp.yaml b/test/data/stages/oscap.remediation/b.mpp.yaml index 83a0007f..c60b70fe 100644 --- a/test/data/stages/oscap.remediation/b.mpp.yaml +++ b/test/data/stages/oscap.remediation/b.mpp.yaml @@ -1,52 +1,30 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "openscap-scanner", - "scap-security-guide" - ] - } - } - } - }, - { - "type": "org.osbuild.oscap.remediation", - "options": { - "data_dir": "/var/tmp", - "config": { - "datastream": "/usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml", - "profile_id": "xccdf_org.ssgproject.content_profile_ospp" - } - } - } - ] - } - ] -} \ No newline at end of file +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - openscap-scanner + - scap-security-guide + - type: org.osbuild.oscap.remediation + options: + data_dir: /var/tmp + config: + datastream: /usr/share/xml/scap/ssg/content/ssg-fedora-ds.xml + profile_id: xccdf_org.ssgproject.content_profile_ospp diff --git a/test/data/stages/ovf/ovf.mpp.yaml b/test/data/stages/ovf/ovf.mpp.yaml index f8a99d8f..75232d4c 100644 --- a/test/data/stages/ovf/ovf.mpp.yaml +++ b/test/data/stages/ovf/ovf.mpp.yaml @@ -1,58 +1,32 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "image.raw", - "size": "104857600" - } - } - ] - }, - { - "name": "vmdk", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image.vmdk", - "format": { - "type": "vmdk", - "subformat": "streamOptimized" - } - } - }, - { - "type": "org.osbuild.ovf", - "options": { - "vmdk": "image.vmdk" - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: image + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: image.raw + size: '104857600' + - name: vmdk + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image.vmdk + format: + type: vmdk + subformat: streamOptimized + - type: org.osbuild.ovf + options: + vmdk: image.vmdk diff --git a/test/data/stages/pam.limits.conf/a.mpp.yaml b/test/data/stages/pam.limits.conf/a.mpp.yaml index ccfad8c9..2507ac63 100644 --- a/test/data/stages/pam.limits.conf/a.mpp.yaml +++ b/test/data/stages/pam.limits.conf/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "pam" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - pam diff --git a/test/data/stages/pam.limits.conf/b.mpp.yaml b/test/data/stages/pam.limits.conf/b.mpp.yaml index 4bbded95..360e3f05 100644 --- a/test/data/stages/pam.limits.conf/b.mpp.yaml +++ b/test/data/stages/pam.limits.conf/b.mpp.yaml @@ -1,90 +1,55 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "pam" - ] - } - } - }, - { - "name": "org.osbuild.pam.limits.conf", - "options": { - "filename": "99-sap.conf", - "config": [ - { - "domain": "@sapsys", - "type": "hard", - "item": "nofile", - "value": 65536 - }, - { - "domain": "@sapsys", - "type": "soft", - "item": "nofile", - "value": 65536 - }, - { - "domain": "@dba", - "type": "hard", - "item": "nofile", - "value": 65536 - }, - { - "domain": "@dba", - "type": "soft", - "item": "nofile", - "value": 65536 - }, - { - "domain": "@sapsys", - "type": "hard", - "item": "nproc", - "value": "unlimited" - }, - { - "domain": "@sapsys", - "type": "soft", - "item": "nproc", - "value": "unlimited" - }, - { - "domain": "@dba", - "type": "hard", - "item": "nproc", - "value": "unlimited" - }, - { - "domain": "@dba", - "type": "soft", - "item": "nproc", - "value": "unlimited" - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - pam + - name: org.osbuild.pam.limits.conf + options: + filename: 99-sap.conf + config: + - domain: '@sapsys' + type: hard + item: nofile + value: 65536 + - domain: '@sapsys' + type: soft + item: nofile + value: 65536 + - domain: '@dba' + type: hard + item: nofile + value: 65536 + - domain: '@dba' + type: soft + item: nofile + value: 65536 + - domain: '@sapsys' + type: hard + item: nproc + value: unlimited + - domain: '@sapsys' + type: soft + item: nproc + value: unlimited + - domain: '@dba' + type: hard + item: nproc + value: unlimited + - domain: '@dba' + type: soft + item: nproc + value: unlimited diff --git a/test/data/stages/parted/parted.mpp.yaml b/test/data/stages/parted/parted.mpp.yaml index 2f746d19..176c0c5f 100644 --- a/test/data/stages/parted/parted.mpp.yaml +++ b/test/data/stages/parted/parted.mpp.yaml @@ -1,64 +1,37 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": "10737418240" - } - }, - { - "type": "org.osbuild.parted", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - }, - "options": { - "label": "gpt", - "partitions": [ - { - "start": 2048, - "size": 1024000, - "bootable": true, - "name": "EFI System Partition" - }, - { - "start": 1026048, - "size": 1024000, - "name": "boot" - }, - { - "start": 2050048, - "size": 4096, - "type": "bios_grub", - "name": "BIOS boot" - }, - { - "start": 2054144, - "size": 18917343, - "type": "lvm", - "name": "LVM" - } - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: '10737418240' + - type: org.osbuild.parted + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + options: + label: gpt + partitions: + - start: 2048 + size: 1024000 + bootable: true + name: EFI System Partition + - start: 1026048 + size: 1024000 + name: boot + - start: 2050048 + size: 4096 + type: bios_grub + name: BIOS boot + - start: 2054144 + size: 18917343 + type: lvm + name: LVM diff --git a/test/data/stages/pwquality.conf/a.mpp.yaml b/test/data/stages/pwquality.conf/a.mpp.yaml index 6ca52077..2bf595b5 100644 --- a/test/data/stages/pwquality.conf/a.mpp.yaml +++ b/test/data/stages/pwquality.conf/a.mpp.yaml @@ -1,37 +1,20 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "libpwquality" - ] - } - } - }, - { - "name": "org.osbuild.pwquality.conf" - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - libpwquality + - name: org.osbuild.pwquality.conf diff --git a/test/data/stages/pwquality.conf/b.mpp.yaml b/test/data/stages/pwquality.conf/b.mpp.yaml index 451a90f2..d32da393 100644 --- a/test/data/stages/pwquality.conf/b.mpp.yaml +++ b/test/data/stages/pwquality.conf/b.mpp.yaml @@ -1,54 +1,31 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "libpwquality" - ] - } - } - }, - { - "name": "org.osbuild.pwquality.conf", - "options": { - "config": { - "minlen": 9, - "minclass": 0, - "dcredit": 1 - } - } - }, - { - "name": "org.osbuild.pwquality.conf", - "options": { - "config": { - "minlen": 6, - "minclass": 3, - "dcredit": 0 - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - libpwquality + - name: org.osbuild.pwquality.conf + options: + config: + minlen: 9 + minclass: 0 + dcredit: 1 + - name: org.osbuild.pwquality.conf + options: + config: + minlen: 6 + minclass: 3 + dcredit: 0 diff --git a/test/data/stages/qemu/qemu.mpp.yaml b/test/data/stages/qemu/qemu.mpp.yaml index 888c83c2..b492bb77 100644 --- a/test/data/stages/qemu/qemu.mpp.yaml +++ b/test/data/stages/qemu/qemu.mpp.yaml @@ -1,236 +1,136 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "image", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "image.raw", - "size": "104857600" - } - } - ] - }, - { - "name": "image.qcow2", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image.qcow2", - "format": { - "type": "qcow2" - } - } - } - ] - }, - { - "name": "image-v1.1.qcow2", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image-v1.1.qcow2", - "format": { - "type": "qcow2", - "compat": "1.1" - } - } - } - ] - }, - { - "name": "image.vdi", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image.vdi", - "format": { - "type": "vdi" - } - } - } - ] - }, - { - "name": "image.vmdk", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image.vmdk", - "format": { - "type": "vmdk" - } - } - } - ] - }, - { - "name": "image-stream.vmdk", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image-stream.vmdk", - "format": { - "type": "vmdk", - "subformat": "streamOptimized" - } - } - } - ] - }, - { - "name": "image.vpc", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image.vpc", - "format": { - "type": "vpc" - } - } - } - ] - }, - { - "name": "image-no-force-size.vpc", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image-no-force-size.vpc", - "format": { - "type": "vpc", - "force_size": false - } - } - } - ] - }, - { - "name": "image.vhdx", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.qemu", - "inputs": { - "image": { - "type": "org.osbuild.files", - "origin": "org.osbuild.pipeline", - "references": { - "name:image": { - "file": "image.raw" - } - } - } - }, - "options": { - "filename": "image.vhdx", - "format": { - "type": "vhdx" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: image + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: image.raw + size: '104857600' + - name: image.qcow2 + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image.qcow2 + format: + type: qcow2 + - name: image-v1.1.qcow2 + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image-v1.1.qcow2 + format: + type: qcow2 + compat: '1.1' + - name: image.vdi + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image.vdi + format: + type: vdi + - name: image.vmdk + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image.vmdk + format: + type: vmdk + - name: image-stream.vmdk + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image-stream.vmdk + format: + type: vmdk + subformat: streamOptimized + - name: image.vpc + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image.vpc + format: + type: vpc + - name: image-no-force-size.vpc + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image-no-force-size.vpc + format: + type: vpc + force_size: false + - name: image.vhdx + build: name:build + stages: + - type: org.osbuild.qemu + inputs: + image: + type: org.osbuild.files + origin: org.osbuild.pipeline + references: + name:image: + file: image.raw + options: + filename: image.vhdx + format: + type: vhdx diff --git a/test/data/stages/resolv-conf/a.mpp.yaml b/test/data/stages/resolv-conf/a.mpp.yaml index 8e2a4746..4a6f1bd4 100644 --- a/test/data/stages/resolv-conf/a.mpp.yaml +++ b/test/data/stages/resolv-conf/a.mpp.yaml @@ -1,15 +1,7 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.resolv-conf" - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.resolv-conf diff --git a/test/data/stages/resolv-conf/b.mpp.yaml b/test/data/stages/resolv-conf/b.mpp.yaml index 918104dd..d1c8e57f 100644 --- a/test/data/stages/resolv-conf/b.mpp.yaml +++ b/test/data/stages/resolv-conf/b.mpp.yaml @@ -1,23 +1,12 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.resolv-conf", - "options": { - "nameserver": [ - "1.2.3.4" - ], - "search": [ - "osbuild.org" - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.resolv-conf + options: + nameserver: + - 1.2.3.4 + search: + - osbuild.org diff --git a/test/data/stages/rhsm.facts/a.mpp.yaml b/test/data/stages/rhsm.facts/a.mpp.yaml index 8e5f8c21..178a4ec7 100644 --- a/test/data/stages/rhsm.facts/a.mpp.yaml +++ b/test/data/stages/rhsm.facts/a.mpp.yaml @@ -1,70 +1,48 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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-container", - "bash", - "coreutils", - "glibc-minimal-langpack", - "rpm", - "shadow-utils", - "sssd-client", - "util-linux", - "microdnf", - "sudo" - ], - "excludes": [ - "kernel", - "dosfstools", - "e2fsprogs", - "fuse-libs", - "gnupg2-smime", - "libss", - "pinentry", - "shared-mime-info", - "trousers", - "xkeyboard-config", - "grubby" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + 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-container + - bash + - coreutils + - glibc-minimal-langpack + - rpm + - shadow-utils + - sssd-client + - util-linux + - microdnf + - sudo + excludes: + - kernel + - dosfstools + - e2fsprogs + - fuse-libs + - gnupg2-smime + - libss + - pinentry + - shared-mime-info + - trousers + - xkeyboard-config + - grubby + 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" + exclude: + docs: true diff --git a/test/data/stages/rhsm.facts/b.mpp.yaml b/test/data/stages/rhsm.facts/b.mpp.yaml index 10540a39..e03d910d 100644 --- a/test/data/stages/rhsm.facts/b.mpp.yaml +++ b/test/data/stages/rhsm.facts/b.mpp.yaml @@ -1,79 +1,53 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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-container", - "bash", - "coreutils", - "glibc-minimal-langpack", - "rpm", - "shadow-utils", - "sssd-client", - "util-linux", - "microdnf", - "sudo" - ], - "excludes": [ - "kernel", - "dosfstools", - "e2fsprogs", - "fuse-libs", - "gnupg2-smime", - "libss", - "pinentry", - "shared-mime-info", - "trousers", - "xkeyboard-config", - "grubby" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.rhsm.facts", - "options": { - "facts": { - "foo": "bar", - "bar": "foo" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + 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-container + - bash + - coreutils + - glibc-minimal-langpack + - rpm + - shadow-utils + - sssd-client + - util-linux + - microdnf + - sudo + excludes: + - kernel + - dosfstools + - e2fsprogs + - fuse-libs + - gnupg2-smime + - libss + - pinentry + - shared-mime-info + - trousers + - xkeyboard-config + - grubby + 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" + exclude: + docs: true + - type: org.osbuild.rhsm.facts + options: + facts: + foo: bar + bar: foo diff --git a/test/data/stages/rhsm/a.mpp.yaml b/test/data/stages/rhsm/a.mpp.yaml index 8d0c96ad..0a4b2640 100644 --- a/test/data/stages/rhsm/a.mpp.yaml +++ b/test/data/stages/rhsm/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "subscription-manager" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - subscription-manager diff --git a/test/data/stages/rhsm/b.mpp.yaml b/test/data/stages/rhsm/b.mpp.yaml index 6e8dcb75..613c891d 100644 --- a/test/data/stages/rhsm/b.mpp.yaml +++ b/test/data/stages/rhsm/b.mpp.yaml @@ -1,55 +1,31 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "subscription-manager" - ] - } - } - }, - { - "name": "org.osbuild.rhsm", - "options": { - "dnf-plugins": { - "product-id": { - "enabled": false - }, - "subscription-manager": { - "enabled": false - } - }, - "subscription-manager": { - "rhsm": { - "manage_repos": false - }, - "rhsmcertd": { - "auto_registration": true - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - subscription-manager + - name: org.osbuild.rhsm + options: + dnf-plugins: + product-id: + enabled: false + subscription-manager: + enabled: false + subscription-manager: + rhsm: + manage_repos: false + rhsmcertd: + auto_registration: true diff --git a/test/data/stages/rpm.macros/a.mpp.yaml b/test/data/stages/rpm.macros/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/rpm.macros/a.mpp.yaml +++ b/test/data/stages/rpm.macros/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/rpm.macros/b.mpp.yaml b/test/data/stages/rpm.macros/b.mpp.yaml index 843192d4..c2a097f8 100644 --- a/test/data/stages/rpm.macros/b.mpp.yaml +++ b/test/data/stages/rpm.macros/b.mpp.yaml @@ -1,29 +1,15 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm.macros", - "options": { - "filename": "/etc/rpm/macros.image-language-conf", - "macros": { - "_install_langs": [ - "en_US" - ] - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm.macros + options: + filename: /etc/rpm/macros.image-language-conf + macros: + _install_langs: + - en_US diff --git a/test/data/stages/rpm/b.mpp.yaml b/test/data/stages/rpm/b.mpp.yaml index b225f78c..a3cc54ae 100644 --- a/test/data/stages/rpm/b.mpp.yaml +++ b/test/data/stages/rpm/b.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "fedora-gpg-keys" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - fedora-gpg-keys diff --git a/test/data/stages/rpmkeys.import/a.mpp.yaml b/test/data/stages/rpmkeys.import/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/rpmkeys.import/a.mpp.yaml +++ b/test/data/stages/rpmkeys.import/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/rpmkeys.import/b.mpp.yaml b/test/data/stages/rpmkeys.import/b.mpp.yaml index 495ebcd7..60b10b6e 100644 --- a/test/data/stages/rpmkeys.import/b.mpp.yaml +++ b/test/data/stages/rpmkeys.import/b.mpp.yaml @@ -1,34 +1,19 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": {} - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpmkeys.import", - "inputs": { - "keys": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "key1", - "text": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGAkKwgBEAC+IQKqp/BI1VIvRRqcnRoAxkzsY3pxIS1L+C4gaWjIMf1eBBTq\nv9eKd4xHsW80VL/tl81WZWO/7JXKmgHODiXrv4HmDIOo6Z1hxehjVRF3Ih4+sKHR\nXCJgwcdJnMfqTKnHiycQggeDuheWbfjV2Fgmvxy0jh0M5PCB5taNz41LmPOaUQmn\nPXcI05CjP5msKjRBObw5Cd2oad60pTNhnBWRf288S8W4wH4jNISOZLZTOf6HU5gJ\nw9wU9RZoaz8kZPNArlJjZsN83S0XLCxpa6UUgYdzPDHOWGtcWGs3bvNAlTYuacun\noICOvTH/ZJU7mgaZbbdSPVLDJdLBKRVgHbdTAK0J913FEiU93GJR5bf/W5FMN7DV\n6hsJVMiY/knJmkTFE9whDSjEc0TAYhQuC1HnzvMPGJvkeEz9nRqna5QUuo7V6LI4\nfZNTSlqFyIi/Oa3ZoliOyOshxJmU3y1HaNcHerO1nFbTtZ7s/TKBhY9oFq4T4gJV\nyFWy33p/JDxOtlVjpHEkzwXGdPe6R4xK8xHObEVraOMZMaweII+tMOGwVbxZu2kC\nA1aflM+oeyU1Fx9qqM0+dYyHO+kp3M5UtfM006RcNcdfoGrA4l6z9sUnHKsYzOLP\nRvKkzxiX3T91vHtRGCXjPOgOsJJzjkFtE1a5oFZg39fC99HZdbX0rUqAtQARAQAB\ntDFGZWRvcmEgKDM2KSA8ZmVkb3JhLTM2LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEU97Sy5Iti42eY/0YmZ98vzircfQFAmAkKwgCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQmZ98vzircfSGaxAAlDBWuY1Ch3YsssGE\nuaeOuaHmDj08p08WUAFUPBN0ID+0pmRQjywFzrufw8Z2g/lHwic+tpXXr/RtMmcl\n+WzLh1E34TRqEngjDJ27QBq1Jyid3h1manKLhZhJ8b1usKHP7Dqh7n+eMTv2Qgrt\n6MrCNe4otWZ9WJ5vp/Bay5yAtU6lNoWBmJ+6BS1/2mg2jhoXrfg/Vey+/i6nYZIk\nM4IcYCyGCi9rjc8NMgkCyzPkPJtsy2taB+VdUcZyjFpc1acmC8sR/2/SEl4+pOtM\nUzW+OUOQFrerX/8MC5LqvmtsiPMyRDCOw3reJTXyoUIehoHoK9QtAdIRRP2nAkPy\nGKycVzsLbtheJXUZharXL1DwOkpMNlm3hp9BxX89m7dLblMSjtrQPs8CkpAExAQW\nFBltsD73ZhGnfE/XdWp7343m1w5W2m85/rczP+2et+c+HPmYTgaJTu8fAF0FoTDd\nuD1r9DxRa2oN3YBiPP/nXnhJaH//GgF/RRw7Fbc66fCh8DTrMsPgmyi/O3/pdSGe\nk0UqEfSdzNPbl7gVFlCbr4Ur5n1ph+sEZqOhMuyszLZZvYvUrHsDuanML5X25coP\nh+rqyjHJJeYlS2tMAQB1fmHB0LWhRhKYaOROAXFmUutFUxVVoigNCl8mV561DCz6\n6/zy81ZGeyUGOEIZ1NFuoY0EhC8=\n=KaIq\n-----END PGP PUBLIC KEY BLOCK-----" - } - } - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: {} +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpmkeys.import + inputs: + keys: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: key1 + text: "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGAkKwgBEAC+IQKqp/BI1VIvRRqcnRoAxkzsY3pxIS1L+C4gaWjIMf1eBBTq\nv9eKd4xHsW80VL/tl81WZWO/7JXKmgHODiXrv4HmDIOo6Z1hxehjVRF3Ih4+sKHR\nXCJgwcdJnMfqTKnHiycQggeDuheWbfjV2Fgmvxy0jh0M5PCB5taNz41LmPOaUQmn\nPXcI05CjP5msKjRBObw5Cd2oad60pTNhnBWRf288S8W4wH4jNISOZLZTOf6HU5gJ\nw9wU9RZoaz8kZPNArlJjZsN83S0XLCxpa6UUgYdzPDHOWGtcWGs3bvNAlTYuacun\noICOvTH/ZJU7mgaZbbdSPVLDJdLBKRVgHbdTAK0J913FEiU93GJR5bf/W5FMN7DV\n6hsJVMiY/knJmkTFE9whDSjEc0TAYhQuC1HnzvMPGJvkeEz9nRqna5QUuo7V6LI4\nfZNTSlqFyIi/Oa3ZoliOyOshxJmU3y1HaNcHerO1nFbTtZ7s/TKBhY9oFq4T4gJV\nyFWy33p/JDxOtlVjpHEkzwXGdPe6R4xK8xHObEVraOMZMaweII+tMOGwVbxZu2kC\nA1aflM+oeyU1Fx9qqM0+dYyHO+kp3M5UtfM006RcNcdfoGrA4l6z9sUnHKsYzOLP\nRvKkzxiX3T91vHtRGCXjPOgOsJJzjkFtE1a5oFZg39fC99HZdbX0rUqAtQARAQAB\ntDFGZWRvcmEgKDM2KSA8ZmVkb3JhLTM2LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEU97Sy5Iti42eY/0YmZ98vzircfQFAmAkKwgCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQmZ98vzircfSGaxAAlDBWuY1Ch3YsssGE\nuaeOuaHmDj08p08WUAFUPBN0ID+0pmRQjywFzrufw8Z2g/lHwic+tpXXr/RtMmcl\n+WzLh1E34TRqEngjDJ27QBq1Jyid3h1manKLhZhJ8b1usKHP7Dqh7n+eMTv2Qgrt\n6MrCNe4otWZ9WJ5vp/Bay5yAtU6lNoWBmJ+6BS1/2mg2jhoXrfg/Vey+/i6nYZIk\nM4IcYCyGCi9rjc8NMgkCyzPkPJtsy2taB+VdUcZyjFpc1acmC8sR/2/SEl4+pOtM\nUzW+OUOQFrerX/8MC5LqvmtsiPMyRDCOw3reJTXyoUIehoHoK9QtAdIRRP2nAkPy\nGKycVzsLbtheJXUZharXL1DwOkpMNlm3hp9BxX89m7dLblMSjtrQPs8CkpAExAQW\nFBltsD73ZhGnfE/XdWp7343m1w5W2m85/rczP+2et+c+HPmYTgaJTu8fAF0FoTDd\nuD1r9DxRa2oN3YBiPP/nXnhJaH//GgF/RRw7Fbc66fCh8DTrMsPgmyi/O3/pdSGe\nk0UqEfSdzNPbl7gVFlCbr4Ur5n1ph+sEZqOhMuyszLZZvYvUrHsDuanML5X25coP\nh+rqyjHJJeYlS2tMAQB1fmHB0LWhRhKYaOROAXFmUutFUxVVoigNCl8mV561DCz6\n6/zy81ZGeyUGOEIZ1NFuoY0EhC8=\n=KaIq\n-----END PGP PUBLIC KEY BLOCK-----" diff --git a/test/data/stages/selinux.config/a.mpp.yaml b/test/data/stages/selinux.config/a.mpp.yaml index b0a388d3..2d8a2273 100644 --- a/test/data/stages/selinux.config/a.mpp.yaml +++ b/test/data/stages/selinux.config/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "selinux-policy" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - selinux-policy diff --git a/test/data/stages/selinux.config/b.mpp.yaml b/test/data/stages/selinux.config/b.mpp.yaml index 84927ada..25710c11 100644 --- a/test/data/stages/selinux.config/b.mpp.yaml +++ b/test/data/stages/selinux.config/b.mpp.yaml @@ -1,41 +1,23 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "selinux-policy" - ] - } - } - }, - { - "name": "org.osbuild.selinux.config", - "options": { - "state":"permissive", - "type": "minimum" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - selinux-policy + - name: org.osbuild.selinux.config + options: + state: permissive + type: minimum diff --git a/test/data/stages/sfdisk/sfdisk.mpp.yaml b/test/data/stages/sfdisk/sfdisk.mpp.yaml index a7d7f836..2b76a6d3 100644 --- a/test/data/stages/sfdisk/sfdisk.mpp.yaml +++ b/test/data/stages/sfdisk/sfdisk.mpp.yaml @@ -1,72 +1,45 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": "10737418240" - } - }, - { - "type": "org.osbuild.sfdisk", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - }, - "options": { - "uuid": "68ad7ade-3fa7-4844-8b2f-1c4cd30bef70", - "label": "gpt", - "partitions": [ - { - "uuid": "80b68ae7-3531-478c-a5ff-9b80f1cb07e9", - "start": 2048, - "size": 1024000, - "bootable": true, - "name": "EFI System Partition", - "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" - }, - { - "uuid": "cfe2beb6-0bb8-4fb6-9075-2e79413ab707", - "start": 1026048, - "size": 1024000, - "name": "boot", - "bootable": true, - "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172" - }, - { - "uuid": "6e2e131d-14c4-4278-876a-5067c40eaecd", - "start": 2050048, - "size": 4096, - "type": "FAC7F1FB-3E8D-4137-A512-961DE09A5549", - "name": "BIOS boot" - }, - { - "uuid": "646e1b09-9358-4a9c-b630-e3c0c296f7c6", - "start": 2054144, - "size": 18917343, - "type": "E6D6D379-F507-44C2-A23C-238F2A3DF928", - "name": "LVM" - } - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: '10737418240' + - type: org.osbuild.sfdisk + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + options: + uuid: 68ad7ade-3fa7-4844-8b2f-1c4cd30bef70 + label: gpt + partitions: + - uuid: 80b68ae7-3531-478c-a5ff-9b80f1cb07e9 + start: 2048 + size: 1024000 + bootable: true + name: EFI System Partition + type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B + - uuid: cfe2beb6-0bb8-4fb6-9075-2e79413ab707 + start: 1026048 + size: 1024000 + name: boot + bootable: true + type: BC13C2FF-59E6-4262-A352-B275FD6F7172 + - uuid: 6e2e131d-14c4-4278-876a-5067c40eaecd + start: 2050048 + size: 4096 + type: FAC7F1FB-3E8D-4137-A512-961DE09A5549 + name: BIOS boot + - uuid: 646e1b09-9358-4a9c-b630-e3c0c296f7c6 + start: 2054144 + size: 18917343 + type: E6D6D379-F507-44C2-A23C-238F2A3DF928 + name: LVM diff --git a/test/data/stages/sgdisk/sgdisk.mpp.yaml b/test/data/stages/sgdisk/sgdisk.mpp.yaml index 11b57c12..4510c209 100644 --- a/test/data/stages/sgdisk/sgdisk.mpp.yaml +++ b/test/data/stages/sgdisk/sgdisk.mpp.yaml @@ -1,72 +1,45 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.truncate", - "options": { - "filename": "disk.img", - "size": "10737418240" - } - }, - { - "type": "org.osbuild.sgdisk", - "devices": { - "device": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.img" - } - } - }, - "options": { - "uuid": "68ad7ade-3fa7-4844-8b2f-1c4cd30bef70", - "quote_partition_name": false, - "partitions": [ - { - "uuid": "80b68ae7-3531-478c-a5ff-9b80f1cb07e9", - "start": 2048, - "size": 1024000, - "bootable": true, - "name": "EFI System Partition", - "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" - }, - { - "uuid": "cfe2beb6-0bb8-4fb6-9075-2e79413ab707", - "start": 1026048, - "size": 1024000, - "name": "boot", - "bootable": true, - "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172" - }, - { - "uuid": "6e2e131d-14c4-4278-876a-5067c40eaecd", - "start": 2050048, - "size": 4096, - "type": "FAC7F1FB-3E8D-4137-A512-961DE09A5549", - "name": "BIOS boot" - }, - { - "uuid": "646e1b09-9358-4a9c-b630-e3c0c296f7c6", - "start": 2054144, - "size": 18917343, - "type": "E6D6D379-F507-44C2-A23C-238F2A3DF928", - "name": "LVM" - } - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.truncate + options: + filename: disk.img + size: '10737418240' + - type: org.osbuild.sgdisk + devices: + device: + type: org.osbuild.loopback + options: + filename: disk.img + options: + uuid: 68ad7ade-3fa7-4844-8b2f-1c4cd30bef70 + quote_partition_name: false + partitions: + - uuid: 80b68ae7-3531-478c-a5ff-9b80f1cb07e9 + start: 2048 + size: 1024000 + bootable: true + name: EFI System Partition + type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B + - uuid: cfe2beb6-0bb8-4fb6-9075-2e79413ab707 + start: 1026048 + size: 1024000 + name: boot + bootable: true + type: BC13C2FF-59E6-4262-A352-B275FD6F7172 + - uuid: 6e2e131d-14c4-4278-876a-5067c40eaecd + start: 2050048 + size: 4096 + type: FAC7F1FB-3E8D-4137-A512-961DE09A5549 + name: BIOS boot + - uuid: 646e1b09-9358-4a9c-b630-e3c0c296f7c6 + start: 2054144 + size: 18917343 + type: E6D6D379-F507-44C2-A23C-238F2A3DF928 + name: LVM diff --git a/test/data/stages/shell.init/a.mpp.yaml b/test/data/stages/shell.init/a.mpp.yaml index d284f150..838aaacf 100644 --- a/test/data/stages/shell.init/a.mpp.yaml +++ b/test/data/stages/shell.init/a.mpp.yaml @@ -1,54 +1,32 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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": [ - "filesystem" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + 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: + - filesystem + 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" + exclude: + docs: true diff --git a/test/data/stages/shell.init/b.mpp.yaml b/test/data/stages/shell.init/b.mpp.yaml index 84c0623a..9c3a2ce2 100644 --- a/test/data/stages/shell.init/b.mpp.yaml +++ b/test/data/stages/shell.init/b.mpp.yaml @@ -1,81 +1,45 @@ -{ - "mpp-vars": { - "arch": "x86_64", - "release": 34, - "releasever": "f$release", - "snapshot": "20210512" - }, - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "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": [ - "filesystem" - ] - } - } - }, - "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" - ], - "exclude": { - "docs": true - } - } - }, - { - "type": "org.osbuild.shell.init", - "options": { - "files": { - "test_env": { - "env": [ - { - "key": "VAR", - "value": "val" - } - ] - }, - "test_env.2": { - "env": [ - { - "key": "ONE", - "value": "1" - }, - { - "key": "TWO", - "value": "2" - } - ] - } - } - } - } - ] - } - ] -} +mpp-vars: + arch: x86_64 + release: 34 + releasever: f$release + snapshot: '20210512' +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + 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: + - filesystem + 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" + exclude: + docs: true + - type: org.osbuild.shell.init + options: + files: + test_env: + env: + - key: VAR + value: val + test_env.2: + env: + - key: ONE + value: '1' + - key: TWO + value: '2' diff --git a/test/data/stages/skopeo/a.mpp.yaml b/test/data/stages/skopeo/a.mpp.yaml index 9dd3f0ba..956cc7a4 100644 --- a/test/data/stages/skopeo/a.mpp.yaml +++ b/test/data/stages/skopeo/a.mpp.yaml @@ -1,91 +1,51 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "input-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "hello.img", - "path": "hello.img" - } - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://inlinefile/{embedded['hello.img']}" - }, - "to": "tree:///hello.img" - } - ] - } - } - ] - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.skopeo", - "inputs": { - "images": { - "type": "org.osbuild.containers", - "origin": "org.osbuild.pipeline", - "references": { - "name:input-tree": { - "name": "localhost/hello" - } - } - } - }, - "options": { - "destination": { - "type": "containers-storage", - "storage-driver": "vfs" - } - } - }, - { - "type": "org.osbuild.skopeo", - "inputs": { - "images": { - "type": "org.osbuild.containers", - "origin": "org.osbuild.source", - "mpp-resolve-images": { - "images": [ - { - "source": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/manifest-list-test", - "name": "manifest-list-test", - "index": true - } - ] - } - } - }, - "options": { - "destination": { - "type": "containers-storage", - "storage-driver": "vfs" - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: input-tree + build: name:build + stages: + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: hello.img + path: hello.img + options: + paths: + - from: + mpp-format-string: input://inlinefile/{embedded['hello.img']} + to: tree:///hello.img + - name: tree + build: name:build + stages: + - type: org.osbuild.skopeo + inputs: + images: + type: org.osbuild.containers + origin: org.osbuild.pipeline + references: + name:input-tree: + name: localhost/hello + options: + destination: + type: containers-storage + storage-driver: vfs + - type: org.osbuild.skopeo + inputs: + images: + type: org.osbuild.containers + origin: org.osbuild.source + mpp-resolve-images: + images: + - source: registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/manifest-list-test + name: manifest-list-test + index: true + options: + destination: + type: containers-storage + storage-driver: vfs diff --git a/test/data/stages/skopeo/b.mpp.yaml b/test/data/stages/skopeo/b.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/skopeo/b.mpp.yaml +++ b/test/data/stages/skopeo/b.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/sshd.config/a.mpp.yaml b/test/data/stages/sshd.config/a.mpp.yaml index d00624b3..33f9c468 100644 --- a/test/data/stages/sshd.config/a.mpp.yaml +++ b/test/data/stages/sshd.config/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "openssh-server" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - openssh-server diff --git a/test/data/stages/sshd.config/b.mpp.yaml b/test/data/stages/sshd.config/b.mpp.yaml index bd50b81a..1c317b4f 100644 --- a/test/data/stages/sshd.config/b.mpp.yaml +++ b/test/data/stages/sshd.config/b.mpp.yaml @@ -1,56 +1,33 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "openssh-server" - ] - } - } - }, - { - "name": "org.osbuild.sshd.config", - "options": { - "config": { - "PasswordAuthentication": false, - "ChallengeResponseAuthentication": false, - "ClientAliveInterval": 180, - "PermitRootLogin": "forced-commands-only" - } - } - }, - { - "name": "org.osbuild.sshd.config", - "options": { - "config": { - "PasswordAuthentication": false, - "ChallengeResponseAuthentication": true, - "ClientAliveInterval": 200, - "PermitRootLogin": false - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - openssh-server + - name: org.osbuild.sshd.config + options: + config: + PasswordAuthentication: false + ChallengeResponseAuthentication: false + ClientAliveInterval: 180 + PermitRootLogin: forced-commands-only + - name: org.osbuild.sshd.config + options: + config: + PasswordAuthentication: false + ChallengeResponseAuthentication: true + ClientAliveInterval: 200 + PermitRootLogin: false diff --git a/test/data/stages/sysconfig/a.mpp.yaml b/test/data/stages/sysconfig/a.mpp.yaml index 64452ac7..c361e047 100644 --- a/test/data/stages/sysconfig/a.mpp.yaml +++ b/test/data/stages/sysconfig/a.mpp.yaml @@ -1,25 +1,14 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.sysconfig", - "options": { - "kernel": { - "update_default": false, - "default_kernel": "default" - }, - "network": { - "networking": false, - "no_zero_conf": false - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.sysconfig + options: + kernel: + update_default: false + default_kernel: default + network: + networking: false + no_zero_conf: false diff --git a/test/data/stages/sysconfig/b.mpp.yaml b/test/data/stages/sysconfig/b.mpp.yaml index 48fb4370..73234f1d 100644 --- a/test/data/stages/sysconfig/b.mpp.yaml +++ b/test/data/stages/sysconfig/b.mpp.yaml @@ -1,54 +1,37 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "runner": "org.osbuild.fedora34" - }, - "stages": [ - { - "name": "org.osbuild.sysconfig", - "options": { - "kernel": { - "update_default": true, - "default_kernel": "kernel" - }, - "network": { - "networking": true, - "no_zero_conf": true - }, - "network-scripts": { - "ifcfg": { - "eth0": { - "device": "eth0", - "bootproto": "dhcp", - "onboot": true, - "type": "Ethernet", - "userctl": true, - "peerdns": true, - "ipv6init": false - }, - "eth1": { - "device": "eth1", - "bootproto": "dhcp", - "onboot": true, - "type": "Ethernet", - "userctl": false, - "peerdns": true, - "ipv6init": true - } - } - }, - "livesys": { - "session": "gnome" - }, - "desktop": { - "preferred": "/usr/bin/gnome", - "displaymanager": "/usr/bin/gdm" - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + runner: org.osbuild.fedora34 + stages: + - name: org.osbuild.sysconfig + options: + kernel: + update_default: true + default_kernel: kernel + network: + networking: true + no_zero_conf: true + network-scripts: + ifcfg: + eth0: + device: eth0 + bootproto: dhcp + onboot: true + type: Ethernet + userctl: true + peerdns: true + ipv6init: false + eth1: + device: eth1 + bootproto: dhcp + onboot: true + type: Ethernet + userctl: false + peerdns: true + ipv6init: true + livesys: + session: gnome + desktop: + preferred: /usr/bin/gnome + displaymanager: /usr/bin/gdm diff --git a/test/data/stages/sysctld/a.mpp.yaml b/test/data/stages/sysctld/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/sysctld/a.mpp.yaml +++ b/test/data/stages/sysctld/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/sysctld/b.mpp.yaml b/test/data/stages/sysctld/b.mpp.yaml index ee85d9de..359f8ae8 100644 --- a/test/data/stages/sysctld/b.mpp.yaml +++ b/test/data/stages/sysctld/b.mpp.yaml @@ -1,65 +1,34 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.sysctld", - "options": { - "filename": "sap.conf", - "config": [ - { - "key": "kernel.pid_max", - "value": "4194304" - }, - { - "key": "vm.max_map_count", - "value": "2147483647" - } - ] - } - }, - { - "name": "org.osbuild.sysctld", - "options": { - "filename": "example.conf", - "config": [ - { - "key": "-key.that.will.not.fail", - "value": "the-greatest-value-ever" - }, - { - "key": "-key.pattern.excluded.with.glob" - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.sysctld + options: + filename: sap.conf + config: + - key: kernel.pid_max + value: '4194304' + - key: vm.max_map_count + value: '2147483647' + - name: org.osbuild.sysctld + options: + filename: example.conf + config: + - key: -key.that.will.not.fail + value: the-greatest-value-ever + - key: -key.pattern.excluded.with.glob diff --git a/test/data/stages/systemd-journald/a.mpp.yaml b/test/data/stages/systemd-journald/a.mpp.yaml index 501e0711..479a8a32 100644 --- a/test/data/stages/systemd-journald/a.mpp.yaml +++ b/test/data/stages/systemd-journald/a.mpp.yaml @@ -1,41 +1,23 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/systemd-journald/b.mpp.yaml b/test/data/stages/systemd-journald/b.mpp.yaml index 2ae48032..0d6fb14e 100644 --- a/test/data/stages/systemd-journald/b.mpp.yaml +++ b/test/data/stages/systemd-journald/b.mpp.yaml @@ -1,55 +1,32 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - }, - { - "type": "org.osbuild.systemd-journald", - "options": { - "filename": "10-test-file-journald.conf", - "config": { - "Journal": { - "Storage": "persistent", - "Compress": "300K", - "SplitMode": "uid", - "Audit": "yes" - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - type: org.osbuild.systemd-journald + options: + filename: 10-test-file-journald.conf + config: + Journal: + Storage: persistent + Compress: 300K + SplitMode: uid + Audit: 'yes' diff --git a/test/data/stages/systemd-logind/a.mpp.yaml b/test/data/stages/systemd-logind/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/systemd-logind/a.mpp.yaml +++ b/test/data/stages/systemd-logind/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/systemd-logind/b.mpp.yaml b/test/data/stages/systemd-logind/b.mpp.yaml index de70b8f4..1ce1f349 100644 --- a/test/data/stages/systemd-logind/b.mpp.yaml +++ b/test/data/stages/systemd-logind/b.mpp.yaml @@ -1,46 +1,26 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.systemd-logind", - "options": { - "filename": "10-ec2-getty-fix.conf", - "config": { - "Login": { - "NAutoVTs": 0, - "ReserveVT": 2 - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.systemd-logind + options: + filename: 10-ec2-getty-fix.conf + config: + Login: + NAutoVTs: 0 + ReserveVT: 2 diff --git a/test/data/stages/systemd.preset/a.mpp.yaml b/test/data/stages/systemd.preset/a.mpp.yaml index fb2874e6..3e722e37 100644 --- a/test/data/stages/systemd.preset/a.mpp.yaml +++ b/test/data/stages/systemd.preset/a.mpp.yaml @@ -1,36 +1,21 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "nftables", - "openssh-server", - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nftables + - openssh-server + - systemd diff --git a/test/data/stages/systemd.preset/b.mpp.yaml b/test/data/stages/systemd.preset/b.mpp.yaml index 34a74047..21d394d9 100644 --- a/test/data/stages/systemd.preset/b.mpp.yaml +++ b/test/data/stages/systemd.preset/b.mpp.yaml @@ -1,45 +1,28 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "nftables", - "openssh-server", - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.systemd.preset", - "options": { - "presets": [ - { "name": "ssh.service", "state": "enable" }, - { "name": "nftables.service", "state": "enable" } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nftables + - openssh-server + - systemd + - name: org.osbuild.systemd.preset + options: + presets: + - name: ssh.service + state: enable + - name: nftables.service + state: enable diff --git a/test/data/stages/systemd.unit/a.mpp.yaml b/test/data/stages/systemd.unit/a.mpp.yaml index fb2874e6..3e722e37 100644 --- a/test/data/stages/systemd.unit/a.mpp.yaml +++ b/test/data/stages/systemd.unit/a.mpp.yaml @@ -1,36 +1,21 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "nftables", - "openssh-server", - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nftables + - openssh-server + - systemd diff --git a/test/data/stages/systemd.unit/b.mpp.yaml b/test/data/stages/systemd.unit/b.mpp.yaml index ae904bc6..b64c17ce 100644 --- a/test/data/stages/systemd.unit/b.mpp.yaml +++ b/test/data/stages/systemd.unit/b.mpp.yaml @@ -1,48 +1,28 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "nftables", - "openssh-server", - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.systemd.unit", - "options": { - "unit": "nm-cloud-setup.service", - "dropin": "10-rh-enable-for-ec2.conf", - "config": { - "Service": { - "Environment": "NM_CLOUD_SETUP_EC2=yes" - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nftables + - openssh-server + - systemd + - name: org.osbuild.systemd.unit + options: + unit: nm-cloud-setup.service + dropin: 10-rh-enable-for-ec2.conf + config: + Service: + Environment: NM_CLOUD_SETUP_EC2=yes diff --git a/test/data/stages/systemd/a.mpp.yaml b/test/data/stages/systemd/a.mpp.yaml index fb2874e6..3e722e37 100644 --- a/test/data/stages/systemd/a.mpp.yaml +++ b/test/data/stages/systemd/a.mpp.yaml @@ -1,36 +1,21 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "nftables", - "openssh-server", - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nftables + - openssh-server + - systemd diff --git a/test/data/stages/systemd/b.mpp.yaml b/test/data/stages/systemd/b.mpp.yaml index f76de50f..3e77ebea 100644 --- a/test/data/stages/systemd/b.mpp.yaml +++ b/test/data/stages/systemd/b.mpp.yaml @@ -1,50 +1,29 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "nftables", - "openssh-server", - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.systemd", - "options": { - "enabled_services": [ - "nftables" - ], - "masked_services": [ - "ldconfig" - ], - "disabled_services": [ - "sshd" - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - nftables + - openssh-server + - systemd + - name: org.osbuild.systemd + options: + enabled_services: + - nftables + masked_services: + - ldconfig + disabled_services: + - sshd diff --git a/test/data/stages/tar/tar.mpp.yaml b/test/data/stages/tar/tar.mpp.yaml index 8a2164f5..14a86669 100644 --- a/test/data/stages/tar/tar.mpp.yaml +++ b/test/data/stages/tar/tar.mpp.yaml @@ -1,66 +1,39 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": {} - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "input-tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.copy", - "inputs": { - "inlinefile": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "42", - "text": "42\n" - } - } - }, - "options": { - "paths": [ - { - "from": { - "mpp-format-string": "input://inlinefile/{embedded['42']}" - }, - "to": "tree:///testfile" - } - ] - } - } - ] - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.tar", - "inputs": { - "tree": { - "type": "org.osbuild.tree", - "origin": "org.osbuild.pipeline", - "references": [ - "name:input-tree" - ] - } - }, - "options": { - "filename": "tarfile.tar", - "root-node": "omit" - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: {} +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: input-tree + build: name:build + stages: + - type: org.osbuild.copy + inputs: + inlinefile: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: '42' + text: '42 + + ' + options: + paths: + - from: + mpp-format-string: input://inlinefile/{embedded['42']} + to: tree:///testfile + - name: tree + build: name:build + stages: + - type: org.osbuild.tar + inputs: + tree: + type: org.osbuild.tree + origin: org.osbuild.pipeline + references: + - name:input-tree + options: + filename: tarfile.tar + root-node: omit diff --git a/test/data/stages/timezone/a.mpp.yaml b/test/data/stages/timezone/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/timezone/a.mpp.yaml +++ b/test/data/stages/timezone/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/timezone/b.mpp.yaml b/test/data/stages/timezone/b.mpp.yaml index f9068a05..e6d7565b 100644 --- a/test/data/stages/timezone/b.mpp.yaml +++ b/test/data/stages/timezone/b.mpp.yaml @@ -1,40 +1,22 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.timezone", - "options": { - "zone": "Europe/Prague" - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.timezone + options: + zone: Europe/Prague diff --git a/test/data/stages/tmpfilesd/a.mpp.yaml b/test/data/stages/tmpfilesd/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/tmpfilesd/a.mpp.yaml +++ b/test/data/stages/tmpfilesd/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/tmpfilesd/b.mpp.yaml b/test/data/stages/tmpfilesd/b.mpp.yaml index 682e6ab5..6b067f11 100644 --- a/test/data/stages/tmpfilesd/b.mpp.yaml +++ b/test/data/stages/tmpfilesd/b.mpp.yaml @@ -1,86 +1,49 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.tmpfilesd", - "options": { - "filename": "sap.conf", - "config": [ - { - "type": "x", - "path": "/tmp/.sap*" - }, - { - "type": "x", - "path": "/tmp/.hdb*lock" - }, - { - "type": "x", - "path": "/tmp/.trex*lock" - } - ] - } - }, - { - "name": "org.osbuild.tmpfilesd", - "options": { - "filename": "example.conf", - "config": [ - { - "type": "w-", - "path": "/proc/sys/vm/swappiness", - "argument": "10" - }, - { - "type": "d", - "path": "/tmp/.X11-unix", - "mode": "1777", - "user": "root", - "group": "root", - "age": "10d" - }, - { - "type": "d", - "path": "/run/uscreens", - "mode": "0755", - "group": "screen" - }, - { - "type": "t", - "path": "/run/cups", - "argument": "security.SMACK64=printing user.attr-with-spaces=\"foo bar\"" - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.tmpfilesd + options: + filename: sap.conf + config: + - type: x + path: /tmp/.sap* + - type: x + path: /tmp/.hdb*lock + - type: x + path: /tmp/.trex*lock + - name: org.osbuild.tmpfilesd + options: + filename: example.conf + config: + - type: w- + path: /proc/sys/vm/swappiness + argument: '10' + - type: d + path: /tmp/.X11-unix + mode: '1777' + user: root + group: root + age: 10d + - type: d + path: /run/uscreens + mode: '0755' + group: screen + - type: t + path: /run/cups + argument: security.SMACK64=printing user.attr-with-spaces="foo bar" diff --git a/test/data/stages/tuned/a.mpp.yaml b/test/data/stages/tuned/a.mpp.yaml index a33b8e30..2530cd23 100644 --- a/test/data/stages/tuned/a.mpp.yaml +++ b/test/data/stages/tuned/a.mpp.yaml @@ -1,35 +1,20 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "tuned", - "tuned-profiles-sap-hana" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - tuned + - tuned-profiles-sap-hana diff --git a/test/data/stages/tuned/b.mpp.yaml b/test/data/stages/tuned/b.mpp.yaml index cc0c289d..28c6ab1a 100644 --- a/test/data/stages/tuned/b.mpp.yaml +++ b/test/data/stages/tuned/b.mpp.yaml @@ -1,43 +1,24 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "tuned", - "tuned-profiles-sap-hana" - ] - } - } - }, - { - "name": "org.osbuild.tuned", - "options": { - "profiles": [ - "sap-hana" - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - tuned + - tuned-profiles-sap-hana + - name: org.osbuild.tuned + options: + profiles: + - sap-hana diff --git a/test/data/stages/udev.rules/a.mpp.yaml b/test/data/stages/udev.rules/a.mpp.yaml index e23b0fcd..aa2565df 100644 --- a/test/data/stages/udev.rules/a.mpp.yaml +++ b/test/data/stages/udev.rules/a.mpp.yaml @@ -1,41 +1,23 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd-udev" - ] - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd-udev diff --git a/test/data/stages/udev.rules/b.mpp.yaml b/test/data/stages/udev.rules/b.mpp.yaml index e0831dcc..889ebb84 100644 --- a/test/data/stages/udev.rules/b.mpp.yaml +++ b/test/data/stages/udev.rules/b.mpp.yaml @@ -1,106 +1,59 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd-udev" - ] - } - } - } - }, - { - "type": "org.osbuild.udev.rules", - "options": { - "filename": "/etc/udev/rules.d/68-azure-sriov-nm-unmanaged.rules", - "rules": [ - { - "comment": [ - "Accelerated Networking on Azure exposes a new SRIOV interface to the VM.", - "This interface is transparently bonded to the synthetic interface,", - "so NetworkManager should just ignore any SRIOV interfaces." - ] - }, - [ - { - "key": "SUBSYSTEM", - "op": "==", - "val": "net" - }, - { - "key": "DRIVERS", - "op": "==", - "val": "hv_pci" - }, - { - "key": { - "name": "ACTION" - }, - "op": "==", - "val": "add" - }, - { - "key": { - "name": "ENV", - "arg": "NM_UNMANAGED" - }, - "op": "=", - "val": "1" - } - ] - ] - } - }, - { - "type": "org.osbuild.udev.rules", - "options": { - "filename": "/etc/udev/rules.d/osbuild.rules", - "rules": [ - { - "comment": [ - "Test\"\n" - ] - }, - [ - { - "key": { - "name": "ENV", - "arg": "test" - }, - "op": "=", - "val": "\"foo\"" - } - ] - ] - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd-udev + - type: org.osbuild.udev.rules + options: + filename: /etc/udev/rules.d/68-azure-sriov-nm-unmanaged.rules + rules: + - comment: + - Accelerated Networking on Azure exposes a new SRIOV interface to the VM. + - This interface is transparently bonded to the synthetic interface, + - so NetworkManager should just ignore any SRIOV interfaces. + - - key: SUBSYSTEM + op: == + val: net + - key: DRIVERS + op: == + val: hv_pci + - key: + name: ACTION + op: == + val: add + - key: + name: ENV + arg: NM_UNMANAGED + op: '=' + val: '1' + - type: org.osbuild.udev.rules + options: + filename: /etc/udev/rules.d/osbuild.rules + rules: + - comment: + - 'Test" + + ' + - - key: + name: ENV + arg: test + op: '=' + val: '"foo"' diff --git a/test/data/stages/untar/a.mpp.yaml b/test/data/stages/untar/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/untar/a.mpp.yaml +++ b/test/data/stages/untar/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/untar/b.mpp.yaml b/test/data/stages/untar/b.mpp.yaml index b913d469..85d71507 100644 --- a/test/data/stages/untar/b.mpp.yaml +++ b/test/data/stages/untar/b.mpp.yaml @@ -1,68 +1,37 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": { - "items": { - "sha256:71c89dfb933588b3de15f2eea5b8ddf81cd76a6518f86bcaeeb6ba558573c620": { - "encoding": "base64", - "data": "H4sIAAAAAAAAA+3RQQrCMBCF4Vl7ipygnWlich5RqYVIoEb0+FpxIRQUQRHh/zZvMW/xYJp2t825tKcy5k1Tz1U+T69iCFNaWupj3kWxYOq7oMknUfMWTZx+YcvM8VBXo3PSD+t9edJ7df9Tt+8vfr0CAAAAAAAAAAAAAAAAAPCuCyJD8KoAKAAA" - } - } - } - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.untar", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:71c89dfb933588b3de15f2eea5b8ddf81cd76a6518f86bcaeeb6ba558573c620": {} - } - } - }, - "options": { - "prefix": "/" - } - }, - { - "type": "org.osbuild.mkdir", - "options": { - "paths": [ - { - "path": "/test" - } - ] - } - }, - { - "type": "org.osbuild.untar", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "references": { - "sha256:71c89dfb933588b3de15f2eea5b8ddf81cd76a6518f86bcaeeb6ba558573c620": {} - } - } - }, - "options": { - "prefix": "/test" - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: + items: + sha256:71c89dfb933588b3de15f2eea5b8ddf81cd76a6518f86bcaeeb6ba558573c620: + encoding: base64 + data: H4sIAAAAAAAAA+3RQQrCMBCF4Vl7ipygnWlich5RqYVIoEb0+FpxIRQUQRHh/zZvMW/xYJp2t825tKcy5k1Tz1U+T69iCFNaWupj3kWxYOq7oMknUfMWTZx+YcvM8VBXo3PSD+t9edJ7df9Tt+8vfr0CAAAAAAAAAAAAAAAAAPCuCyJD8KoAKAAA +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.untar + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:71c89dfb933588b3de15f2eea5b8ddf81cd76a6518f86bcaeeb6ba558573c620: {} + options: + prefix: / + - type: org.osbuild.mkdir + options: + paths: + - path: /test + - type: org.osbuild.untar + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + references: + sha256:71c89dfb933588b3de15f2eea5b8ddf81cd76a6518f86bcaeeb6ba558573c620: {} + options: + prefix: /test diff --git a/test/data/stages/users/a.mpp.yaml b/test/data/stages/users/a.mpp.yaml index 892e5a3c..7baf2a7f 100644 --- a/test/data/stages/users/a.mpp.yaml +++ b/test/data/stages/users/a.mpp.yaml @@ -1,35 +1,20 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "pam", - "shadow-utils" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - pam + - shadow-utils diff --git a/test/data/stages/users/b.mpp.yaml b/test/data/stages/users/b.mpp.yaml index de1b6ef5..6fd1c0a0 100644 --- a/test/data/stages/users/b.mpp.yaml +++ b/test/data/stages/users/b.mpp.yaml @@ -1,67 +1,39 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "pam", - "shadow-utils" - ] - } - } - }, - { - "name": "org.osbuild.users", - "options": { - "users": { - "test": { - "password": "$6$s06sY2/bZbmuyE4a$JTn/Ki2jbNG.wGeCvt6mcjaIZ2HV.H8VjLzIMZs7f2G48NMFlcB2/OhbHZ6HhZAOcb.CmUb2qywSW2DkKe6gn0" - }, - "test.user_42-OSBUILD": { - "password": "$6$TZ9oR8s21Srjvamo$PRHaXMA6pcZc7M2yKGEDLVir/GjCUgV0gW8ZIrab3cY4fKth/MBGm/wndn2MxSU31dCmCnb.3uEODgyaAkaRh0" - }, - "nohome": { - "home": "", - "uid": 1337 - }, - "elodie": { - "home": "", - "uid": 2000 - } - } - } - }, - { - "name": "org.osbuild.users", - "options": { - "users": { - "elodie": { - "home": "/home/elodie", - "uid": 2000 - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - pam + - shadow-utils + - name: org.osbuild.users + options: + users: + test: + password: $6$s06sY2/bZbmuyE4a$JTn/Ki2jbNG.wGeCvt6mcjaIZ2HV.H8VjLzIMZs7f2G48NMFlcB2/OhbHZ6HhZAOcb.CmUb2qywSW2DkKe6gn0 + test.user_42-OSBUILD: + password: $6$TZ9oR8s21Srjvamo$PRHaXMA6pcZc7M2yKGEDLVir/GjCUgV0gW8ZIrab3cY4fKth/MBGm/wndn2MxSU31dCmCnb.3uEODgyaAkaRh0 + nohome: + home: '' + uid: 1337 + elodie: + home: '' + uid: 2000 + - name: org.osbuild.users + options: + users: + elodie: + home: /home/elodie + uid: 2000 diff --git a/test/data/stages/waagent.conf/a.mpp.yaml b/test/data/stages/waagent.conf/a.mpp.yaml index b9e25bae..06967726 100644 --- a/test/data/stages/waagent.conf/a.mpp.yaml +++ b/test/data/stages/waagent.conf/a.mpp.yaml @@ -1,37 +1,20 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "WALinuxAgent" - ] - } - } - }, - { - "name": "org.osbuild.waagent.conf" - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - WALinuxAgent + - name: org.osbuild.waagent.conf diff --git a/test/data/stages/waagent.conf/b.mpp.yaml b/test/data/stages/waagent.conf/b.mpp.yaml index 4b5a6483..ec2fdc2d 100644 --- a/test/data/stages/waagent.conf/b.mpp.yaml +++ b/test/data/stages/waagent.conf/b.mpp.yaml @@ -1,51 +1,28 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "WALinuxAgent" - ] - } - } - }, - { - "name": "org.osbuild.waagent.conf", - "options": { - "config": { - "ResourceDisk.Format": false, - "ResourceDisk.EnableSwap": true - } - } - }, - { - "name": "org.osbuild.waagent.conf", - "options": { - "config": { - "ResourceDisk.EnableSwap": false - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - WALinuxAgent + - name: org.osbuild.waagent.conf + options: + config: + ResourceDisk.Format: false + ResourceDisk.EnableSwap: true + - name: org.osbuild.waagent.conf + options: + config: + ResourceDisk.EnableSwap: false diff --git a/test/data/stages/wsl.conf/a.mpp.yaml b/test/data/stages/wsl.conf/a.mpp.yaml index 6a8f9cb4..4295c820 100644 --- a/test/data/stages/wsl.conf/a.mpp.yaml +++ b/test/data/stages/wsl.conf/a.mpp.yaml @@ -1,41 +1,23 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "filesystem" - ] - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - filesystem diff --git a/test/data/stages/wsl.conf/b.mpp.yaml b/test/data/stages/wsl.conf/b.mpp.yaml index f42d3ab6..5c3fb3e5 100644 --- a/test/data/stages/wsl.conf/b.mpp.yaml +++ b/test/data/stages/wsl.conf/b.mpp.yaml @@ -1,49 +1,27 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "filesystem" - ] - } - } - } - }, - { - "type": "org.osbuild.wsl.conf", - "options": { - "boot": { - "systemd": false - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - filesystem + - type: org.osbuild.wsl.conf + options: + boot: + systemd: false diff --git a/test/data/stages/xz/a.mpp.yaml b/test/data/stages/xz/a.mpp.yaml index ca5db5e9..5b998ab7 100644 --- a/test/data/stages/xz/a.mpp.yaml +++ b/test/data/stages/xz/a.mpp.yaml @@ -1,21 +1,10 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.noop" - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.noop diff --git a/test/data/stages/xz/b.mpp.yaml b/test/data/stages/xz/b.mpp.yaml index 9e767eaf..0b23da05 100644 --- a/test/data/stages/xz/b.mpp.yaml +++ b/test/data/stages/xz/b.mpp.yaml @@ -1,37 +1,23 @@ -{ - "version": "2", - "sources": { - "org.osbuild.inline": {} - }, - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.xz", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "hw", - "text": "Hallo Welt\n" - } - } - }, - "options": { - "filename": "compressed.xz" - } - } - ] - } - ] -} +version: '2' +sources: + org.osbuild.inline: {} +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.xz + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: hw + text: 'Hallo Welt + + ' + options: + filename: compressed.xz diff --git a/test/data/stages/yum.config/a.mpp.yaml b/test/data/stages/yum.config/a.mpp.yaml index cc62c7e7..be284433 100644 --- a/test/data/stages/yum.config/a.mpp.yaml +++ b/test/data/stages/yum.config/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "yum" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - yum diff --git a/test/data/stages/yum.config/b.mpp.yaml b/test/data/stages/yum.config/b.mpp.yaml index a5f74ddb..65271b47 100644 --- a/test/data/stages/yum.config/b.mpp.yaml +++ b/test/data/stages/yum.config/b.mpp.yaml @@ -1,49 +1,27 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "yum" - ] - } - } - }, - { - "name": "org.osbuild.yum.config", - "options": { - "config": { - "http_caching": "packages" - }, - "plugins": { - "langpacks": { - "locales": [ - "en_US.UTF-8" - ] - } - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - yum + - name: org.osbuild.yum.config + options: + config: + http_caching: packages + plugins: + langpacks: + locales: + - en_US.UTF-8 diff --git a/test/data/stages/yum.repos/a.mpp.yaml b/test/data/stages/yum.repos/a.mpp.yaml index 1b804ed7..aa2d7b00 100644 --- a/test/data/stages/yum.repos/a.mpp.yaml +++ b/test/data/stages/yum.repos/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf diff --git a/test/data/stages/yum.repos/b.mpp.yaml b/test/data/stages/yum.repos/b.mpp.yaml index 32be3b58..bcc718e5 100644 --- a/test/data/stages/yum.repos/b.mpp.yaml +++ b/test/data/stages/yum.repos/b.mpp.yaml @@ -1,91 +1,61 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "dnf" - ] - } - } - }, - { - "name": "org.osbuild.yum.repos", - "options": { - "filename": "google-cloud.repo", - "repos": [ - { - "id": "google-compute-engine", - "name": "Google Compute Engine", - "baseurl": ["https://www.example.org/google-compute-engine"], - "enabled": true, - "gpgcheck": true, - "repo_gpgcheck": false, - "gpgkey": [ - "https://packages.cloud.google.com/yum/doc/yum-key.gpg", - "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg" - ] - }, - { - "id": "google-cloud-sdk", - "name": "Google Compute SDK", - "baseurl": ["https://www.example.org/google-cloud-sdk"], - "enabled": true, - "gpgcheck": true, - "repo_gpgcheck": false, - "gpgkey": [ - "https://packages.cloud.google.com/yum/doc/yum-key.gpg", - "https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg" - ] - } - ] - } - }, - { - "name": "org.osbuild.yum.repos", - "options": { - "filename": "my-cool-repo.repo", - "repos": [ - { - "id": "cOOlest.id-ever_invented:42", - "metalink": "https://www.example.org/cool-repo" - }, - { - "id": "cOOlest.id-ever_invented:43", - "mirrorlist": "https://www.example.org/cool-repo", - "cost": 123, - "enabled": false, - "gpgkey": ["secretkey"], - "module_hotfixes": true, - "name": "Very cool repo", - "priority": 42, - "gpgcheck": true, - "repo_gpgcheck": true, - "sslverify": true - } - ] - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - dnf + - name: org.osbuild.yum.repos + options: + filename: google-cloud.repo + repos: + - id: google-compute-engine + name: Google Compute Engine + baseurl: + - https://www.example.org/google-compute-engine + enabled: true + gpgcheck: true + repo_gpgcheck: false + gpgkey: + - https://packages.cloud.google.com/yum/doc/yum-key.gpg + - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg + - id: google-cloud-sdk + name: Google Compute SDK + baseurl: + - https://www.example.org/google-cloud-sdk + enabled: true + gpgcheck: true + repo_gpgcheck: false + gpgkey: + - https://packages.cloud.google.com/yum/doc/yum-key.gpg + - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg + - name: org.osbuild.yum.repos + options: + filename: my-cool-repo.repo + repos: + - id: cOOlest.id-ever_invented:42 + metalink: https://www.example.org/cool-repo + - id: cOOlest.id-ever_invented:43 + mirrorlist: https://www.example.org/cool-repo + cost: 123 + enabled: false + gpgkey: + - secretkey + module_hotfixes: true + name: Very cool repo + priority: 42 + gpgcheck: true + repo_gpgcheck: true + sslverify: true diff --git a/test/data/stages/zipl/a.mpp.yaml b/test/data/stages/zipl/a.mpp.yaml index 283fed98..1d4457fd 100644 --- a/test/data/stages/zipl/a.mpp.yaml +++ b/test/data/stages/zipl/a.mpp.yaml @@ -1,34 +1,19 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd diff --git a/test/data/stages/zipl/b.mpp.yaml b/test/data/stages/zipl/b.mpp.yaml index 54686338..b4d04603 100644 --- a/test/data/stages/zipl/b.mpp.yaml +++ b/test/data/stages/zipl/b.mpp.yaml @@ -1,40 +1,22 @@ -{ - "pipeline": { - "build": { - "mpp-import-pipeline": { - "path": "../manifests/f34-build.json" - }, - "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", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "systemd" - ] - } - } - }, - { - "name": "org.osbuild.zipl", - "options": { - "timeout": 1 - } - } - ] - } -} +pipeline: + build: + mpp-import-pipeline: + path: ../manifests/f34-build.json + 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 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - systemd + - name: org.osbuild.zipl + options: + timeout: 1 diff --git a/test/data/stages/zstd/a.mpp.yaml b/test/data/stages/zstd/a.mpp.yaml index 4bcc1ae2..73d879c8 100644 --- a/test/data/stages/zstd/a.mpp.yaml +++ b/test/data/stages/zstd/a.mpp.yaml @@ -1,41 +1,23 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "zstd" - ] - } - } - } - } - ] - } - ] -} +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - zstd diff --git a/test/data/stages/zstd/b.mpp.yaml b/test/data/stages/zstd/b.mpp.yaml index 2fd2336b..0bf6be60 100644 --- a/test/data/stages/zstd/b.mpp.yaml +++ b/test/data/stages/zstd/b.mpp.yaml @@ -1,62 +1,35 @@ -{ - "version": "2", - "pipelines": [ - { - "mpp-import-pipeline": { - "path": "../manifests/f34-build-v2.json", - "id": "build" - }, - "runner": "org.osbuild.fedora34" - }, - { - "name": "tree", - "build": "name:build", - "stages": [ - { - "type": "org.osbuild.rpm", - "inputs": { - "packages": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-depsolve": { - "architecture": "x86_64", - "module-platform-id": "f34", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/", - "repos": [ - { - "id": "default", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/" - } - ], - "packages": [ - "zstd" - ] - } - } - } - }, - { - "type": "org.osbuild.zstd", - "inputs": { - "file": { - "type": "org.osbuild.files", - "origin": "org.osbuild.source", - "mpp-embed": { - "id": "hw", - "text": "Hallo Welt\n" - } - } - }, - "options": { - "filename": "compressed.zstd" - } - } - ] - } - ] -} - - - - +version: '2' +pipelines: + - mpp-import-pipeline: + path: ../manifests/f34-build-v2.json + id: build + runner: org.osbuild.fedora34 + - name: tree + build: name:build + stages: + - type: org.osbuild.rpm + inputs: + packages: + type: org.osbuild.files + origin: org.osbuild.source + mpp-depsolve: + architecture: x86_64 + module-platform-id: f34 + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + repos: + - id: default + baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/ + packages: + - zstd + - type: org.osbuild.zstd + inputs: + file: + type: org.osbuild.files + origin: org.osbuild.source + mpp-embed: + id: hw + text: 'Hallo Welt + ' + options: + filename: compressed.zstd