Skip to content

Commit

Permalink
test: test edge-ami with ostree commit with @minimal-environment
Browse files Browse the repository at this point in the history
The @minimal-environment rpm group includes 'dracut-config-rescue'
which, by default, will create a rescue kernel configuration.  With
ostree-based images, this will fail, since rpm-ostree requires that only
one kernel exists in an image.  We now disable dracut when installing
packages for ostree commits, so this should no longer be a problem.

Adding a configuration pair to test that the image builds and boots.
The configs include:
1. An edge-container built with the @minimal-environment rpm group,
   which will pull in the dracut-config-rescue package.  This is built
   for all RHEL 9 versions.
2. An edge-ami built using the new edge container as input.  The config
   includes a user so that the image can be booted in CI.
  • Loading branch information
achilleas-k committed Oct 18, 2024
1 parent 28661af commit 6dd6e57
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 0 deletions.
16 changes: 16 additions & 0 deletions test/config-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,22 @@
"edge-ami"
]
},
"./configs/minimal-environment.json": {
"image-types": [
"edge-container"
],
"distros": [
"rhel-9*"
]
},
"./configs/edge-ostree-pull-user-minimalenv.json": {
"image-types": [
"edge-ami"
],
"distros": [
"rhel-9*"
]
},
"./configs/embed-containers-2.json": {
"image-types": [
"edge-container"
Expand Down
23 changes: 23 additions & 0 deletions test/configs/edge-ostree-pull-user-minimalenv.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "edge-ostree-pull-user-minimalenv",
"blueprint": {
"customizations": {
"user": [
{
"groups": [
"wheel"
],
"key": "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNebAh6SjpAn8wB53K4695cGnHGuCtl4RdaX3futZgJUultHyzeYHnzMO7d4++qnRL+Rworew62LKP560uvtncc= github.com/osbuild/images",
"name": "osbuild"
}
]
}
},
"depends": {
"config": "minimal-environment.json",
"image-type": "edge-container"
},
"ostree": {
"url": "http://example.com/repo"
}
}
10 changes: 10 additions & 0 deletions test/configs/minimal-environment.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "minimal-environment",
"blueprint": {
"groups": [
{
"name": "minimal-environment"
}
]
}
}

0 comments on commit 6dd6e57

Please sign in to comment.