RHEL-90: replace ec2X86_64BaseTreePipeline by osPipeline
Move the x86_64 specific configuration from `ec2X86_64BaseTreePipeline` to x86_64-specific image configurations for EC2 / AMI images. As a result, remove the `ec2X86_64BaseTreePipeline` entirely and replace it with `osPipeline`. Regenerate image test cases. While there are changed in the manifests, the actual image configuration didn't change at all and thus the `image-info` report was not changed. Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
parent
776de86e6d
commit
43ea54f8de
6 changed files with 72 additions and 96 deletions
|
|
@ -942,6 +942,18 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.systemd.unit",
|
||||
"options": {
|
||||
|
|
@ -960,18 +972,6 @@
|
|||
"profile": "sssd"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.fstab",
|
||||
"options": {
|
||||
|
|
|
|||
|
|
@ -958,6 +958,18 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.systemd.unit",
|
||||
"options": {
|
||||
|
|
@ -976,18 +988,6 @@
|
|||
"profile": "sssd"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.fstab",
|
||||
"options": {
|
||||
|
|
|
|||
|
|
@ -1152,6 +1152,18 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.systemd.unit",
|
||||
"options": {
|
||||
|
|
@ -1170,18 +1182,6 @@
|
|||
"profile": "sssd"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.fstab",
|
||||
"options": {
|
||||
|
|
|
|||
|
|
@ -1206,6 +1206,18 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.systemd.unit",
|
||||
"options": {
|
||||
|
|
@ -1224,18 +1236,6 @@
|
|||
"profile": "sssd"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.dracut.conf",
|
||||
"options": {
|
||||
"filename": "ec2.conf",
|
||||
"config": {
|
||||
"add_drivers": [
|
||||
"nvme",
|
||||
"xen-blkfront"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "org.osbuild.selinux.config",
|
||||
"options": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue