update_eve_image: derive remove version from .ver#1187
Merged
eriknordmark merged 1 commit intoMay 21, 2026
Conversation
The eveimage-remove follow-up assertion added in df8752b fails on EVE PR builds: when $eve_tag is a PR number, $short_version is "<N>-<hv>-<arch>", but the squashfs's embedded eve_version is 0.0.0-pr<N>-<sha>-<hv>-<arch>. EdgeNodeEVEImageRemove keys by exact match on --os-version, so passing --os-version=$short_version never finds the BaseOSConfig adam stored after eveimage-update (which used the .ver-corrected embedded version). The remove no-ops, the modern baseos block + ContentTree stay, and `! stdout '{{ $short_version }}'` trips on the contentInfo[].URL. Drop --os-version from the three test calls so the function falls into its existing .ver-correction-file path and resolves the same version eveimage-update used. The OCI variant has no .ver alongside an OCI URL, so its assertion is dropped pending a follow-up that lets EdgeNodeEVEImageRemove fall back to dev.GetBaseOSVersion() when no other source resolves. Verified against evebuild/pr:5973-kvm-amd64 in a Multipass sandbox: TestEdenScripts/update_eve_image_http FAILs on upstream/master with the same `unexpected match for '5973-kvm-amd64'` signature as recent EVE-Upgrade jobs, and PASSes with this patch. Signed-off-by: eriknordmark <erik@zededa.com> Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or 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
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.
Summary
This is a recent regression which the eden CI didn't catch since it depends on the form of EVE version string used to run the test. Fails for the 0.0.0-pr names but works on 16.6.0!
The
eveimage-removefollow-up assertion added in df8752b (! stdout '{{ $short_version }}'afterget-config) fails on every EVE PR-build run because$short_versionis built from$eve_tag-$eve_hv-$eve_arch— but PR-build squashfs files embed0.0.0-pr<N>-<sha>-<hv>-<arch>in theireve_version.EdgeNodeEVEImageRemovekeys by exact match on--os-version, so--os-version=$short_versionnever finds theBaseOSConfigadam stored aftereveimage-update(which used the.ver-corrected embedded version). The remove no-ops, the modern baseos block + ContentTree stay, and the assertion trips on the squashfs filename incontentInfo[].URL.This patch drops
--os-versionfrom the three test calls intests/update_eve_image/testdata/. The function then falls into its existing.ver-correction-file lookup (same patheveimage-updateuses), resolves the embedded version, and clears the modern baseos block. The OCI variant has no.veralongside an OCI URL, so its! stdoutassertion is removed pending a follow-up that letsEdgeNodeEVEImageRemovefall back todev.GetBaseOSVersion()when no other source resolves.Failure history this fixes
EVE Upgrade (ext4/zfs)jobs on every EVE PR-build run since df8752b merged on 2026-05-18; sameunexpected match for '<N>-kvm-amd64' found in stdout: <N>-kvm-amd64signature.sleepline; that didn't help because the mismatch is structural.Test plan
Reproduced end-to-end against
evebuild/pr:5973-kvm-amd64(same image as the failing CI) in an isolated Multipass sandbox:upstream/master@ 3380f41, no patch):TestEdenScripts/update_eve_image_httpFAILs atrevert_eve_image_update.txt:56withunexpected match for '5973-kvm-amd64' found in stdout: 5973-kvm-amd64— exactly the CI signature.TestEdenScripts/update_eve_image_httpPASSes (505.82 s end-to-end).🤖 Generated with Claude Code