-
Notifications
You must be signed in to change notification settings - Fork 51
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
build_sysext: Detect dev rebuild of release tag, fix build ID issue #2259
Merged
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
krnowak
reviewed
Aug 28, 2024
krnowak
approved these changes
Aug 28, 2024
Build action triggered: https://github.com/flatcar/scripts/actions/runs/10613043126 |
build_sysext uses a base squashfs (basically a full snapshot of the Flatcar OS image) to build custom sysexts on top. Before building it ensures the base image actualy matches the OS version in the repository root. The version string includes a BUILD_ID which might be auto-generated (by including common.sh) if it is not present in the version file - e.g. when the version is an official release (tag). This build ID auto-generation causes issues with the version check when image build and sysext build scripts run independently - each will generate its own build ID, and this will cause build_sysext's version check to fail. build_sysext will now use the build id from the base squashfs when it is not set in the source tree's version.txt to work around that issue. This is a more general solution than 361eda2 (which this patch reverts) as it directly addresses the issue in build_sysext instead of working around it in sysext_prod_builder. Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
t-lo
force-pushed
the
t-lo/fix-sysext-build-id-issue-in-image-to-vm
branch
from
August 28, 2024 14:55
5b70e83
to
6b3d60e
Compare
Tests are green and PR is approved, but main has moved on. Will force rebase and merge since it's a small change and well understood. |
t-lo
added a commit
that referenced
this pull request
Aug 29, 2024
build_sysext: Detect dev rebuild of release tag, fix build ID issue
t-lo
added a commit
that referenced
this pull request
Aug 29, 2024
build_sysext: Detect dev rebuild of release tag, fix build ID issue
t-lo
added a commit
that referenced
this pull request
Aug 29, 2024
build_sysext: Detect dev rebuild of release tag, fix build ID issue
Merged and cherry-picked for flatcar-3975, flatcar-4012, flatcar-4054. |
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.
build_sysext uses a base squashfs (basically a full snapshot of the Flatcar OS image) to build custom sysexts on top. Before building it ensures the base image actualy matches the OS version in the repository root.
The version string includes a BUILD_ID which might be auto-generated (by including common.sh) if it is not present in the version file - e.g. when the version is an official release (tag). This build ID auto-generation causes issues with the version check when image build and sysext build scripts run independently - each will generate its own build ID, and this will cause build_sysext's version check to fail.
build_sysext will now use the build id from the base squashfs when it is not set in the source tree's version.txt to work around that issue. This is a more general solution than 361eda2 (which this patch reverts) as it directly addresses the issue in build_sysext instead of working around it in sysext_prod_builder.
How to use
git clone https://github.com/flatcar/scripts.git cd scripts git checkout t-lo/fix-sysext-build-id-issue-in-image-to-vm
Testing done
Ran the above builds.
Cherry-pick / backport
To all active mainenance branches except LTS (which doesn't use sysext), i.e.
flatcar-3975
flatcar-4012
flatcar-4054