Skip to content

Commit 2578ad2

Browse files
committed
testiso: stop checking the ostree commit in the aleph file
This doesn't work in the container-native path because the ostree-commit in the aleph is from the encapsulation done as part of `build-chunked-oci`, but the `ostree-commit` we embed in `meta.json` is from the imported "merge commit". I _think_ what we need is to tweak our osbuild manifests to use the import path rather than unencapsulate path, and that should result in the merge commit getting inserted in the aleph (but also that would be one less dependency on even having `ostree-commit` in `meta.json` in the first place). Anyway, I think just checking the version string is good enough for our purposes here.
1 parent 7ebb4b8 commit 2578ad2

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

mantle/cmd/kola/testiso.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ ExecStart=/bin/sh -c "journalctl -t coreos-installer-service | /usr/bin/awk '/[D
189189
ExecStart=/bin/sh -c "/usr/bin/udevadm settle"
190190
ExecStart=/bin/sh -c "/usr/bin/mount /dev/disk/by-label/root /mnt"
191191
ExecStart=/bin/sh -c "/usr/bin/jq -er '.[\"build\"]? + .[\"version\"]? == \"%s\"' /mnt/.coreos-aleph-version.json"
192-
ExecStart=/bin/sh -c "/usr/bin/jq -er '.[\"ostree-commit\"] == \"%s\"' /mnt/.coreos-aleph-version.json"
193192
[Install]
194193
RequiredBy=coreos-installer.target
195194
`
@@ -833,7 +832,7 @@ func testPXE(ctx context.Context, inst platform.Install, outdir string) (time.Du
833832
liveConfig.AddSystemdUnit("coreos-test-entered-emergency-target.service", signalFailureUnit, conf.Enable)
834833

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

0 commit comments

Comments
 (0)