sysext_prod_builder: fix build id mismatch #2056
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
t-lo
force-pushed
the
t-lo/fix-build-id-mismatch
branch
from
4da0276
to
50f21e5
Compare
t-lo
force-pushed
the
t-lo/fix-build-id-mismatch
branch
from
50f21e5
to
1b66d7b
Compare
|
This was tested on alpha-3975, I hope it doesn't break main 😅 |
|
Build action triggered: https://github.com/flatcar/scripts/actions/runs/9660651984 |
krnowak
approved these changes
Jun 25, 2024
This change fixes a version mismatch of FLATCAR_BUILD_ID when performing a dev build of an existing release tag. The build ID is part of the version string of dev builds, separated by a "+" from the main version. If common.sh detects a dev build (COREOS_OFFICIAL != 1) and FLATCAR_BUILD_ID is empty, common.sh will generate a new ID based on a timestamp. For official releases, FLATCAR_BUILD_ID is not set in version.txt. A dev build of a release tag would make common.sh generate a new ID each time it is sourced by different processes. build_image sources common.sh first, and writes the resulting version string the OS image's os-release file. build_sysext runs later and also sources common.sh, leading its version check to fail as its own VERSION now differs from the version of the OS image it's supposed to generate sysexts for. This change reads BUILD_ID from the OS image rootfs in sysext_prod_builder and exports FLATCAR_BUILD_ID accordingly before calling build_sysext. Hence FLATCAR_BUILD_ID is not empty, so common.sh in build_sysext will not re-generate it. Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
t-lo
force-pushed
the
t-lo/fix-build-id-mismatch
branch
from
1b66d7b
to
361eda2
Compare
|
Rebased to latest main (which re-set branch protection but I'm not going to re-run the whole build now) |
t-lo
added a commit
that referenced
this pull request
Jun 25, 2024
sysext_prod_builder: fix build id mismatch
t-lo
added a commit
that referenced
this pull request
Jun 25, 2024
sysext_prod_builder: fix build id mismatch
|
Merged and backported to 4012 (Alpha), 3975 (Beta), and 3815 (Stable). LTS is still on torcx. |
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.
This change fixes a version mismatch of
FLATCAR_BUILD_IDwhen performing a dev build of an existing release tag. The build ID is part of the version string of dev builds, separated by a+from the main version. If common.sh detects a dev build (COREOS_OFFICIAL!= 1) andFLATCAR_BUILD_IDis empty,common.shwill generate a new ID based on a timestamp. This is usually desired behaviour to prevent accidentally marking a dev build non-dev (which would cause breakage much later when signature checks fail).For official releases,
FLATCAR_BUILD_IDis not set in version.txt. A dev build of a release tag would makecommon.shgenerate a new ID each time it is sourced by different processes. build_image sourcescommon.shfirst, and writes the resulting version string the OS image's os-release file.build_sysextruns later and also sourcescommon.sh, leading its version check to fail as its own VERSION now differs from the version of the OS image it's supposed to generate sysexts for. This is usually desired behaviour sincebuild_sysextregularly operates on pre-built OS images; only when run fromsysext_prod_builderduring an OS image build it doesn't.This change reads
BUILD_IDfrom the OS image rootfs insysext_prod_builderand exportsFLATCAR_BUILD_IDaccordingly before calling build_sysext. HenceFLATCAR_BUILD_IDis not empty, so common.sh in build_sysext will not re-generate it.How to use
Try to build a dev version of a release tag, e.g.
./build_imagewill fail withbuild_sysextcomplaining about version mismatches. Base squashfs version and SDK board packages versions will have version ID timestamps that differ by a few minutes, e.g.Apply the patch from this branch, try again. Build now works.
Backports and cherry-picks
Should be cherry-picked to all maintenance branches that use
build_sysext, i.e. at least alpha, beta, and stable, and possibly LTS.