mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-22 17:35:55 +03:00
tests/staged-deploy: Cleanup initial state
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:
parent
240f6d3ac6
commit
37e1921b51
@ -9,6 +9,10 @@ prepare_tmpdir
|
||||
n=$(nth_boot)
|
||||
case "${n}" in
|
||||
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}
|
||||
# Test the deploy --stage functionality; first, we stage a deployment
|
||||
# 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: *,,')
|
||||
assert_streq "${firstdeploycommit}" "${newcommit}"
|
||||
# Cleanup
|
||||
## TODO remove workaround for https://github.com/coreos/rpm-ostree/pull/2021
|
||||
mkdir -p /var/lib/rpm-ostree/history
|
||||
rpm-ostree cleanup -rp
|
||||
echo "ok upgrade with staging"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user