[RFC] test: test against reference images lib generated manifest #186
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,139 @@ | ||
| otk.version: "1" | ||
|
|
||
| otk.define: | ||
| # XXX: de-dup | ||
| distro: centos | ||
| version: 9 | ||
| kernel_commandline: "console=tty0 console=ttyS0,115200n8 net.ifnames=0 nvme_core.io_timeout=4294967295" | ||
| filesystem: | ||
| modifications: | ||
| filename: "image.raw" | ||
| otk.include: "common/gen-partition-table-x86_64.yaml" | ||
|
|
||
| otk.target.osbuild: | ||
| pipelines: | ||
| - otk.include: "pipeline/build.yaml" | ||
| - name: os | ||
| build: name:build | ||
| stages: | ||
| - otk.include: "fragment/kernel-cmdline.yaml" | ||
| - type: org.osbuild.rpm | ||
| - type: org.osbuild.fix-bls | ||
| options: | ||
| prefix: "" | ||
| - type: org.osbuild.locale | ||
| options: | ||
| language: en_US.UTF-8 | ||
| - type: org.osbuild.keymap | ||
| options: | ||
| keymap: us | ||
| x11-keymap: | ||
| layouts: | ||
| - us | ||
| - type: org.osbuild.timezone | ||
| options: | ||
| zone: UTC | ||
| - type: org.osbuild.chrony | ||
| options: | ||
| servers: | ||
| - hostname: 169.254.169.123 | ||
| minpoll: 4 | ||
| maxpoll: 4 | ||
| iburst: true | ||
| prefer: true | ||
| leapsectz: "" | ||
| - type: org.osbuild.sysconfig | ||
| options: | ||
| kernel: | ||
| update_default: true | ||
| default_kernel: kernel | ||
| network: | ||
| networking: true | ||
| no_zero_conf: true | ||
| network-scripts: | ||
| ifcfg: | ||
| eth0: | ||
| bootproto: dhcp | ||
| device: eth0 | ||
| ipv6init: false | ||
| onboot: true | ||
| peerdns: true | ||
| type: Ethernet | ||
| userctl: true | ||
| - type: org.osbuild.systemd-logind | ||
| options: | ||
| filename: 00-getty-fixes.conf | ||
| config: | ||
| Login: | ||
| NAutoVTs: 0 | ||
| - type: org.osbuild.cloud-init | ||
| options: | ||
| filename: 00-rhel-default-user.cfg | ||
| config: | ||
| system_info: | ||
| default_user: | ||
| name: ec2-user | ||
| - type: org.osbuild.modprobe | ||
| options: | ||
| filename: blacklist-nouveau.conf | ||
| commands: | ||
| - command: blacklist | ||
| modulename: nouveau | ||
| - type: org.osbuild.modprobe | ||
| options: | ||
| filename: blacklist-amdgpu.conf | ||
| commands: | ||
| - command: blacklist | ||
| modulename: amdgpu | ||
| - type: org.osbuild.dracut.conf | ||
| options: | ||
| filename: sgdisk.conf | ||
| config: | ||
| install_items: | ||
| - sgdisk | ||
| - type: org.osbuild.dracut.conf | ||
| options: | ||
| filename: ec2.conf | ||
| config: | ||
| add_drivers: | ||
| - nvme | ||
| - xen-blkfront | ||
| - type: org.osbuild.systemd.unit | ||
| options: | ||
| unit: nm-cloud-setup.service | ||
| dropin: 10-rh-enable-for-ec2.conf | ||
| config: | ||
| Service: | ||
| Environment: | ||
| - key: NM_CLOUD_SETUP_EC2 | ||
| value: "yes" | ||
| - type: org.osbuild.authselect | ||
| options: | ||
| profile: sssd | ||
| - type: org.osbuild.sshd.config | ||
| options: | ||
| config: | ||
| PasswordAuthentication: false | ||
| - otk.external.otk-make-fstab-stage: | ||
| ${filesystem} | ||
| - otk.include: "fragment/grub2.yaml" | ||
| - type: org.osbuild.systemd | ||
| options: | ||
| enabled_services: | ||
| - sshd | ||
| - NetworkManager | ||
| - nm-cloud-setup.service | ||
| - nm-cloud-setup.timer | ||
| - cloud-init | ||
| - cloud-init-local | ||
| - cloud-config | ||
| - cloud-final | ||
| - reboot.target | ||
| - tuned | ||
| default_target: multi-user.target | ||
| - type: org.osbuild.selinux | ||
|
There was a problem hiding this comment. this should be split into a fragement as it's use with the same options everywhere There was a problem hiding this comment. Not entirely, we'd need separate fragments for the build and root pipelines as the build pipeline also sets install_t on cp, so maybe two fragments? :) |
||
| options: | ||
| file_contexts: etc/selinux/targeted/contexts/files/file_contexts | ||
| - otk.include: "pipeline/image.yaml" | ||
| sources: | ||
| org.osbuild.curl: | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,66 @@ | ||
| otk.version: "1" | ||
|
|
||
| otk.define: | ||
| # XXX: dedup | ||
| distro: centos | ||
| version: 9 | ||
| kernel_commandline: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" | ||
| filesystem: | ||
| modifications: | ||
| # empty | ||
| otk.include: "common/gen-partition-table-x86_64.yaml" | ||
|
|
||
| otk.target.osbuild: | ||
| pipelines: | ||
| - otk.include: "pipeline/build.yaml" | ||
| - name: os | ||
| build: name:build | ||
| stages: | ||
| - otk.include: "fragment/kernel-cmdline.yaml" | ||
| - type: org.osbuild.rpm | ||
| - type: org.osbuild.fix-bls | ||
| options: | ||
| prefix: "" | ||
| - type: org.osbuild.locale | ||
| options: | ||
| language: C.UTF-8 | ||
| - type: org.osbuild.timezone | ||
| options: | ||
| zone: America/New_York | ||
| - type: org.osbuild.sysconfig | ||
| options: | ||
| kernel: | ||
| update_default: true | ||
| default_kernel: kernel | ||
| network: | ||
| networking: true | ||
| no_zero_conf: true | ||
| - otk.external.otk-make-fstab-stage: | ||
| ${filesystem} | ||
| - otk.include: "fragment/grub2.yaml" | ||
| - type: org.osbuild.systemd | ||
| options: | ||
| default_target: multi-user.target | ||
| - type: org.osbuild.selinux | ||
| options: | ||
| file_contexts: etc/selinux/targeted/contexts/files/file_contexts | ||
| - otk.include: "pipeline/image.yaml" | ||
| - name: qcow2 | ||
| build: name:build | ||
| stages: | ||
| - type: org.osbuild.qemu | ||
| inputs: | ||
| image: | ||
| type: org.osbuild.files | ||
| origin: org.osbuild.pipeline | ||
| references: | ||
| name:image: | ||
| file: ${filesystem.const.filename} | ||
| options: | ||
| # XXX: provide a way to derive the name from the filesystem one? | ||
| filename: disk.qcow2 | ||
| format: | ||
| type: qcow2 | ||
| compat: "1.1" | ||
| sources: | ||
| org.osbuild.curl: | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extracting: org.osbuild.fix-bls,org.osbuild.keymap, org.osbuild.timezone would work here but because it's in a list it will look quite awkward
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It won't be that awkward, I believe we already use
otk.op.joinin some places and I used it 'everywhere' in my branch just so fragments could define one or more stages :)