Test/imgtestlib/get_osbuild_commit(): consider only gitlab-ci-runner distro (HMS-5243) #1124
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
Previously, the osbuild commit stored in image build `info.json` was based on the host distro. However, we always use the same distro for all image build jobs, which is defined in the Schutzfile. Modify the `get_osbuild_commit()` function to not take the distro as an argument, but instead read the `gitlab-ci-runner` from the Schutzfile and determine the osbuild commit based on its distro. This will make it much easier to determine the actual osbuild commit that was (supposed to be) used for the image builds on the checked out branch. Consistency of data in `image.info` and the reality will be ensured. Make `get_osbuild_commit()` raise a KeyError in case there's no osbuild commit defined in Shutzfile for the gitlab-ci-runner distro, so that we do not accidentally miss it and use unknown osbuild version from the distro repos. Signed-off-by: Tomáš Hozza <[email protected]>
The `read_osrelease()` function is no longer used by any script, therefore delete it. Signed-off-by: Tomáš Hozza <[email protected]>
schutzbot
changed the title
|
I've missed the other dependencies. I'll rethink the whole change from a different angle... |
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.
Previously, the osbuild commit stored in image build
info.jsonwas based on the host distro. However, we always use the same distro for all image build jobs, which is defined in the Schutzfile.Modify the
get_osbuild_commit()function to not take the distro as an argument, but instead read thegitlab-ci-runnerfrom the Schutzfile and determine the osbuild commit based on its distro.This will make it much easier to determine the actual osbuild commit that was (supposed to be) used for the image builds on the checked out branch. Consistency of data in
image.infoand the reality will be ensured.Make
get_osbuild_commit()raise a KeyError in case there's no osbuild commit defined in Shutzfile for the gitlab-ci-runner distro, so that we do not accidentally miss it and use unknown osbuild version from the distro repos./jira-epic COMPOSER-2318
JIRA: HMS-5243