Skip to content

Commit ecac0c3

Browse files
committed
test/upgrade-basic: Use ostree commit from meta.json
1 parent c332caf commit ecac0c3

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

mantle/kola/tests/upgrade/basic.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,11 @@ func fcosUpgradeBasic(c cluster.TestCluster) {
209209

210210
c.Run("upgrade-from-current", func(c cluster.TestCluster) {
211211
newVersion := kola.CosaBuild.Meta.OstreeVersion + ".kola"
212+
ostreeCommit := kola.CosaBuild.Meta.OstreeCommit
212213
if usingContainer {
213-
// until https://github.com/bootc-dev/bootc/pull/1421 propagates, we can't rely on kola.CosaBuild.Meta.OstreeCommit being the same
214-
ostreeCommit := c.MustSSHf(m, "sudo rpm-ostree status --json | jq -r '.deployments[0].checksum'")
215214
newCommit := c.MustSSHf(m, "sudo ostree commit -b testupdate --tree=ref=%s --add-metadata-string version=%s", ostreeCommit, newVersion)
216215
rpmostreeRebase(c, m, string(newCommit), newVersion)
217216
} else {
218-
ostreeCommit := kola.CosaBuild.Meta.OstreeCommit
219217
ostree_command := "ostree commit --repo %s -b %s --tree ref=%s --add-metadata-string version=%s " +
220218
"--keep-metadata='fedora-coreos.stream' --keep-metadata='coreos-assembler.basearch' --parent=%s"
221219
newCommit := c.MustSSHf(m,

0 commit comments

Comments
 (0)