Skip to content

Commit cca0826

Browse files
committed
Use /ostree/deploy as canonical API for deployment monitoring
Replaced the use of the systemd PathChanged property on /ostree/repo/refs/heads/ostree/1/1 with /ostree/deploy, the canonical API for monitoring deployment changes in ostree
1 parent 23adfa5 commit cca0826

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

mantle/kola/tests/upgrade/basic.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,10 @@ func runFnAndWaitForRebootIntoVersion(c cluster.TestCluster, m platform.Machine,
316316
func waitForUpgradeToBeStaged(c cluster.TestCluster, m platform.Machine) {
317317
// Here we set up a systemd path unit to watch for when ostree
318318
// behind the scenes updates the refs in the repo under the
319-
// /ostree/repo/refs/heads/ostree/1/1 directory. refchanged.path
320-
// will trigger when it gets updated and will then stop wait.service.
319+
// /ostree/deploy directory.
320+
// Using /ostree/deploy as the canonical API for monitoring deployment changes.
321+
// This path is updated by ostree for deployment changes.
322+
// refchanged.path will trigger when it gets updated and will then stop wait.service.
321323
// The systemd-run --wait causes it to not return here (and thus
322324
// continue execution of code here) until wait.service has been
323325
// stopped by refchanged.service. This is an effort to make us
@@ -329,7 +331,7 @@ func waitForUpgradeToBeStaged(c cluster.TestCluster, m platform.Machine) {
329331
//
330332
// Note: if systemd-run ever gains the ability to --wait when
331333
// generating a path unit then the below can be simplified.
332-
c.RunCmdSync(m, "sudo systemd-run -u refchanged --path-property=PathChanged=/ostree/repo/refs/heads/ostree/1/1 systemctl stop wait.service")
334+
c.RunCmdSync(m, "sudo systemd-run -u refchanged --path-property=PathChanged=/ostree/deploy systemctl stop wait.service")
333335
c.RunCmdSync(m, "sudo systemd-run --wait -u wait sleep infinity")
334336
}
335337

0 commit comments

Comments
 (0)