Skip to content

testiso: stop checking the ostree commit in the aleph file #4268

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 18, 2025
Merged

testiso: stop checking the ostree commit in the aleph file #4268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adf76ee
testiso: stop checking the ostree commit in the aleph file
jlebon Aug 15, 2025
ca01c31
cmd-import: don't use `--preserve-digests` when importing from contai…
jlebon Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions mantle/cmd/kola/testiso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ ExecStart=/bin/sh -c "journalctl -t coreos-installer-service | /usr/bin/awk '/[D
ExecStart=/bin/sh -c "/usr/bin/udevadm settle"
ExecStart=/bin/sh -c "/usr/bin/mount /dev/disk/by-label/root /mnt"
ExecStart=/bin/sh -c "/usr/bin/jq -er '.[\"build\"]? + .[\"version\"]? == \"%s\"' /mnt/.coreos-aleph-version.json"
ExecStart=/bin/sh -c "/usr/bin/jq -er '.[\"ostree-commit\"] == \"%s\"' /mnt/.coreos-aleph-version.json"
[Install]
RequiredBy=coreos-installer.target
`
Expand Down Expand Up @@ -833,7 +832,7 @@ func testPXE(ctx context.Context, inst platform.Install, outdir string) (time.Du
liveConfig.AddSystemdUnit("coreos-test-entered-emergency-target.service", signalFailureUnit, conf.Enable)

if isOffline {
contents := fmt.Sprintf(downloadCheck, kola.CosaBuild.Meta.OstreeVersion, kola.CosaBuild.Meta.OstreeCommit)
contents := fmt.Sprintf(downloadCheck, kola.CosaBuild.Meta.OstreeVersion)
liveConfig.AddSystemdUnit("coreos-installer-offline-check.service", contents, conf.Enable)
}

Expand Down
7 changes: 5 additions & 2 deletions src/cmd-import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ def generate_oci_archive(args, tmpd):
print(f"Copying {args.srcimg.partition(':')[2]} to {tmpf}")
shutil.copy(args.srcimg.partition(':')[2], tmpf)
else:
subprocess.check_call(['skopeo', 'copy', '--preserve-digests', args.srcimg,
f"oci-archive:{tmpf}"])
extra_args = []
# in the containers-storage case, there's no digest to preserve
if not args.srcimg.startswith('containers-storage'):
extra_args += ['--preserve-digests']
subprocess.check_call(['skopeo', 'copy', args.srcimg, f"oci-archive:{tmpf}"] + extra_args)
return tmpf


Expand Down
Loading