Skip to content

Pin the osbuild-composer commit for testing#535

Open
achilleas-k wants to merge 7 commits into
osbuild:mainfrom
achilleas-k:pin-composer
Open

Pin the osbuild-composer commit for testing#535
achilleas-k wants to merge 7 commits into
osbuild:mainfrom
achilleas-k:pin-composer

Conversation

@achilleas-k
Copy link
Copy Markdown
Member

Pin the osbuild-composer commit to use so that it doesn't float and cause unexpected failures.

We will later add a cronjob to update the commit regularly, like we do with osbuild.

@achilleas-k achilleas-k requested review from F-X64 and thozza March 17, 2026 14:55
sourcery-ai[bot]

This comment was marked as off-topic.

@achilleas-k
Copy link
Copy Markdown
Member Author

Failures will be fixed by a04ceb6 (on #534).

F-X64
F-X64 previously approved these changes Mar 18, 2026
Copy link
Copy Markdown
Collaborator

@F-X64 F-X64 left a comment

Choose a reason for hiding this comment

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

I'm in favor of fixing the version.
I assume we will have an automatic PR as we do with the schutzfile?

@achilleas-k
Copy link
Copy Markdown
Member Author

I assume we will have an automatic PR as we do with the schutzfile?

Not yet, but I'll set it up.

@achilleas-k
Copy link
Copy Markdown
Member Author

Actually, let me just add the scheduled job in this PR. No need to do it elsewhere.

@achilleas-k
Copy link
Copy Markdown
Member Author

Added script and action.

@achilleas-k achilleas-k requested a review from F-X64 March 23, 2026 10:39
Copy link
Copy Markdown
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

In general, this looks good, but there are some copy&paste errors.

Comment thread schutzbot/update-schutzfile-composer
Comment thread schutzbot/update-schutzfile-composer
Comment thread .github/workflows/update-composer.yml
@achilleas-k
Copy link
Copy Markdown
Member Author

achilleas-k commented Mar 30, 2026

Thanks for catching those. Fixed and rebased.

thozza
thozza previously approved these changes Mar 31, 2026
Copy link
Copy Markdown
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

LGTM

@thozza thozza enabled auto-merge (rebase) March 31, 2026 17:24
Pin the osbuild-composer commit to use so that it doesn't float and
cause unexpected failures.
When deploying, read the commit ID from the Schutzfile to set up the
osbuild-composer repository.
Adapted from the osbuild update script in osbuild/images [1].

Unlike the existing function in deploy.sh, it doesn't check for
successful CI runs on the commit.  It simply makes sure it doesn't use a
post-release version bump commit (which don't run CI).

Failed CI runs in osbuild-composer often happen after the RPM build
stage and we only care about RPMs being available.  Skipping a commit
based on the overall GitLab CI run would skip over many valid commits.
Cases where the PR is created pointing to a commit that doesn't have an
RPM for a specific distro we need here can be dealt with manually
(usually by retrying the CI job on the main branch of osbuild-composer).

[1] https://github.com/osbuild/images/blob/8d0c776c4bf8687f413f3fcac2e28625bba2ce18/test/scripts/update-schutzfile-osbuild
Add a workflow that runs every Sunday to update the osbuild-composer
commit ID in the Schutzfile.
New runners are needed for gitlab.
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.

3 participants