Skip to content

Commit

Permalink
tests/kola: cancel any pending rpm-ostree transaction in upgrade test
Browse files Browse the repository at this point in the history
We've seen it where zincati gets restarted but a previous rpm-ostree
deploy (that had been scheduled by Zincati) was still running. Let's
cancel anything that's pending before restarting Zincati.
  • Loading branch information
dustymabe committed May 16, 2023
1 parent 1553518 commit f3404c6
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tests/kola/upgrade/extended/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,10 @@ if vereq $version $last_release; then
fi

# Restart Zincati if configuration was changed
[ "${need_zincati_restart}" == "true" ] && systemctl restart zincati
if [ "${need_zincati_restart}" == "true" ]; then
rpm-ostree cancel # in case anything was already in progress
systemctl restart zincati
fi

# Watch the Zincati logs to see if it got a lead on a new update.
# Timeout after some time if no update. Unset pipefail since the
Expand Down

0 comments on commit f3404c6

Please sign in to comment.