diff options
| author | Colin Walters <walters@verbum.org> | 2020-03-21 20:39:18 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2020-03-21 20:48:15 +0000 |
| commit | 635fd0aa9c418d2b7cd90f779db2208b0c70959d (patch) | |
| tree | f74cd280c2fd998655ff78f50c205813b7f9cce7 /tests/kola | |
| parent | 89fdbf1b0eb65d72bbfd7f243f37084668c29650 (diff) | |
| download | ostree-635fd0aa9c418d2b7cd90f779db2208b0c70959d.tar.gz | |
tests/kola: Two test fixes
Now that we're actually running this in CI.
Diffstat (limited to 'tests/kola')
| -rwxr-xr-x | tests/kola/destructive/itest-label-selinux.sh | 1 | ||||
| -rwxr-xr-x | tests/kola/destructive/staged-deploy.sh | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/kola/destructive/itest-label-selinux.sh b/tests/kola/destructive/itest-label-selinux.sh index 87fb26f0..7bfd2351 100755 --- a/tests/kola/destructive/itest-label-selinux.sh +++ b/tests/kola/destructive/itest-label-selinux.sh @@ -5,6 +5,7 @@ set -xeuo pipefail . ${KOLA_EXT_DATA}/libinsttest.sh +require_writable_sysroot date cd /ostree/repo/tmp diff --git a/tests/kola/destructive/staged-deploy.sh b/tests/kola/destructive/staged-deploy.sh index 47d7c9af..e0c17a27 100755 --- a/tests/kola/destructive/staged-deploy.sh +++ b/tests/kola/destructive/staged-deploy.sh @@ -71,6 +71,8 @@ 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" |