shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-05-29 01:05:37 +03:00
Code Issues Projects Releases Wiki Activity

tests/staged-deploy: Cleanup initial state

Browse Source 
I'm using [cosa build-fast](https://github.com/coreos/coreos-assembler/pull/1371)
and this test doesn't like starting out with two deployments.  Clean
things up to one at the start just to simplify things.
This commit is contained in:
Colin Walters 2020-04-29 01:45:48 +00:00
parent 240f6d3ac6
commit 37e1921b51
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/kola/destructive/staged-deploy.sh
View File

@ -9,6 +9,10 @@ prepare_tmpdir
n=$(nth_boot) n=$(nth_boot)
case "${n}" in case "${n}" in
1) 1)
# Initial cleanup to handle the cosa fast-build case
## TODO remove workaround for https://github.com/coreos/rpm-ostree/pull/2021
mkdir -p /var/lib/rpm-ostree/history
rpm-ostree cleanup -pr
commit=${host_commit} commit=${host_commit}
# Test the deploy --stage functionality; first, we stage a deployment # Test the deploy --stage functionality; first, we stage a deployment
# reboot, and validate that it worked. # reboot, and validate that it worked.
@ -71,8 +75,6 @@ case "${n}" in
firstdeploycommit=$(rpm-ostree status |grep 'Commit:' |head -1|sed -e 's,^ *Commit: *,,') firstdeploycommit=$(rpm-ostree status |grep 'Commit:' |head -1|sed -e 's,^ *Commit: *,,')
assert_streq "${firstdeploycommit}" "${newcommit}" assert_streq "${firstdeploycommit}" "${newcommit}"
# Cleanup # Cleanup
## TODO remove workaround for https://github.com/coreos/rpm-ostree/pull/2021
mkdir -p /var/lib/rpm-ostree/history
rpm-ostree cleanup -rp rpm-ostree cleanup -rp
echo "ok upgrade with staging" echo "ok upgrade with staging"