Validate config map and fix bad Fedora IoT test config #1156
Conversation
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
Add a group to the edge-ostree-pull-user config with name osbuild and gid 1002. The group is assigned to the user in the same config. This covers the scenario that causes the bug that was fixed in the previous commit. This config is used to build edge-ami images in CI.
achilleas-k
force-pushed
the
verify-config-map
branch
from
8b7cf20 to
ed9d970
Compare
|
I changed some test names in the github actions which means I had to change the required test list for PRs. We'll need to rebase all other open PRs when this is merged. |
thozza
previously approved these changes
Jan 21, 2025
Reads the config map and verifies that:
1. All listed config files exist, and
2. The combination of distros, arches, and image-types produces at least
one valid build configuration for each config file.
Note that this does not catch all issues with a config-map. For
example, the following configuration is considered valid:
```json
{
"./configs/some-config.json": {
"distros": [
"rhel-10*",
],
"image-types": [
"ami",
"invalid-type-name"
]
}
}
```
because it still produces (at least) one valid configuration:
rhel-10, ami, any architecture
This is (somewhat) necessary because we also want the following to be
valid:
```json
{
"./configs/some-config.json": {
"distros": [
"rhel-9*",
"fedora*"
],
"image-types": [
"iot-commit",
"edge-commit"
]
}
}
```
where iot-commit is only valid for fedora* and edge-commit is only valid
for rhel-9*.
Install the go dependencies when running pytest because we now call cmd/list-images when testing validate-config-map.
iot-ami is not a valid image type name. Test iot-qcow2-image instead.
achilleas-k
force-pushed
the
verify-config-map
branch
from
ed9d970 to
3a33aa4
Compare
|
Dropped the |
|
Dismissed again. Had to set the GOPROXY on all the github jobs that need it because of an expired cert at the source of one of the dependencies. |
|
GitLab didn't seem to need it. Do we set it on our gitlab runners by default? |
achilleas-k
force-pushed
the
verify-config-map
branch
from
18ec556 to
0484251
Compare
schuellerf
requested changes
Jan 21, 2025
Workaround for expired cert at source of indirect dependency go.opencensus.io/trace The Fedora tests are run using a container again instead of relying on the makefile so we can control the environment.
achilleas-k
force-pushed
the
verify-config-map
branch
from
0484251 to
2903a6f
Compare
schuellerf
approved these changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
iot-amiimage type in the config map toiot-qcow2-image.iot-amiis not a valid image type name.¹ Note that the validation script does not catch all issues with the config map. For
example, the following configuration is considered valid:
{ "./configs/some-config.json": { "distros": [ "rhel-10*", ], "image-types": [ "ami", "invalid-type-name" ] } }because it still produces (at least) one valid configuration:
This is (somewhat) necessary because we also want the following to be
valid:
{ "./configs/some-config.json": { "distros": [ "rhel-9*", "fedora*" ], "image-types": [ "iot-commit", "edge-commit" ] } }where iot-commit is only valid for fedora* and edge-commit is only valid
for rhel-9*.