Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to require pinned osbuild commit for the CI runners (HMS-5248) #1126

Merged
merged 5 commits into from
Jan 7, 2025

Conversation

thozza
Copy link
Member

@thozza thozza commented Jan 6, 2025

Ensure that we always use well-known osbuild version on CI workers by:

  • update-schutzfile-osbuild script unconditionally defining the latest osbuild commit for all distros in the Schutzfile.
  • setup-osbuild-repo script failing in case the host distro does not have the osbuild dependency commit defined.

Define the osbuild dependency commit for every distro we run in GH actions or in GitLab CI. Delete repo overrides for F40, since we no longer run F40 workers in GitLab.

/jira-epic COMPOSER-2318

JIRA: HMS-5248

thozza added 2 commits January 6, 2025 06:25
Modify the script to not only update osbuild dependency commit for all
distros defined in the Schutzfile, but also define it for any distros
that didn't have it.

This will ensure consistency of using a well known osbuild version when
testing image builds in CI and storing it in the S3 CI cache with the
osbuild ref being part of the object prefix.

Signed-off-by: Tomáš Hozza <[email protected]>
Modify the script to fail in case the host distro version does not have
the osbuild dependency commit ID defined in the Schutzfile. This will
ensure that we'll always use a well-known osbuild version for testing
image builds and for the artifacts stored in the S3 cache.

Signed-off-by: Tomáš Hozza <[email protected]>
@schutzbot schutzbot changed the title Changes to require pinned osbuild commit for the CI runners Changes to require pinned osbuild commit for the CI runners (HMS-5248) Jan 6, 2025
@thozza thozza marked this pull request as draft January 6, 2025 09:10
@thozza
Copy link
Member Author

thozza commented Jan 6, 2025

I didn't realize that the GH actions also use setup-osbuild-repo. I'll need to rethink that change.

thozza added 3 commits January 6, 2025 10:25
Make sure that the osbuild dependency commit is defined for all distros
on which we setup the osbuild repository. Specifically whose that we run
in GH actions and in GitLab CI.

Signed-off-by: Tomáš Hozza <[email protected]>
We no longer run F40 in GitLab CI, so there's not need to define repo
overrides for it. We do not override system repositories for GH actions.

Signed-off-by: Tomáš Hozza <[email protected]>
I noticed that the action that is running unit tests on Fedora was
setting up YUM repository for osbuild on the Ubuntu runner and then
again inside the Fedora container in which it runs unit tests.

Setting the osbuild YUM repository on the Ubuntu runner is useless,
therefore delete the task.

Signed-off-by: Tomáš Hozza <[email protected]>
@thozza thozza force-pushed the ensure-osbuild-dependency branch from 41e9b76 to b7485d9 Compare January 6, 2025 09:33
@thozza thozza marked this pull request as ready for review January 6, 2025 09:59
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice. LGTM!

@achilleas-k achilleas-k added this pull request to the merge queue Jan 7, 2025
Merged via the queue into osbuild:main with commit 3cd836c Jan 7, 2025
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants