@@ -314,25 +314,25 @@ func runFnAndWaitForRebootIntoVersion(c cluster.TestCluster, m platform.Machine,
314314}
315315
316316func waitForUpgradeToBeStaged (c cluster.TestCluster , m platform.Machine ) {
317- // Here we set up a systemd path unit to watch for when ostree
318- // behind the scenes updates the refs in the repo under the
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.
323- // The systemd-run --wait causes it to not return here (and thus
324- // continue execution of code here) until wait.service has been
325- // stopped by refchanged.service. This is an effort to make us
326- // start waiting inside runFnAndWaitForRebootIntoVersion until
327- // later in the upgrade process because we are seeing failures due
328- // to timeouts and we're trying to reduce the variability by
329- // minimizing the wait inside that function to just the actual reboot.
330- // https://github.com/coreos/fedora-coreos-tracker/issues/1805
331- //
332- // Note: if systemd-run ever gains the ability to --wait when
333- // generating a path unit then the below can be simplified.
334- c .RunCmdSync (m , "sudo systemd-run -u refchanged --path-property=PathChanged=/ostree/deploy systemctl stop wait.service" )
335- c .RunCmdSync (m , "sudo systemd-run --wait -u wait sleep infinity" )
317+ // Here we set up a systemd path unit to watch for when ostree
318+ // behind the scenes updates the refs in the repo under the
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.
323+ // The systemd-run --wait causes it to not return here (and thus
324+ // continue execution of code here) until wait.service has been
325+ // stopped by refchanged.service. This is an effort to make us
326+ // start waiting inside runFnAndWaitForRebootIntoVersion until
327+ // later in the upgrade process because we are seeing failures due
328+ // to timeouts and we're trying to reduce the variability by
329+ // minimizing the wait inside that function to just the actual reboot.
330+ // https://github.com/coreos/fedora-coreos-tracker/issues/1805
331+ //
332+ // Note: if systemd-run ever gains the ability to --wait when
333+ // generating a path unit then the below can be simplified.
334+ c .RunCmdSync (m , "sudo systemd-run -u refchanged --path-property=PathChanged=/ostree/deploy systemctl stop wait.service" )
335+ c .RunCmdSync (m , "sudo systemd-run --wait -u wait sleep infinity" )
336336}
337337
338338func waitForUpgradeToVersion (c cluster.TestCluster , m platform.Machine , version string ) {
0 commit comments