diff --git a/mantle/cmd/kola/testiso.go b/mantle/cmd/kola/testiso.go index aee80ceeac..1bdd088d44 100644 --- a/mantle/cmd/kola/testiso.go +++ b/mantle/cmd/kola/testiso.go @@ -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 ` @@ -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) } diff --git a/src/cmd-import b/src/cmd-import index e942ccd3eb..0327fdf1b6 100755 --- a/src/cmd-import +++ b/src/cmd-import @@ -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