packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2040 from cgwalters/itest-require-writable 

tests/kola: Two test fixes
This commit is contained in:
OpenShift Merge Robot 2020-03-23 20:01:04 +01:00 committed by GitHub
parent 89fdbf1b0e 635fd0aa9c
commit d87301b111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/kola/destructive/itest-label-selinux.sh
View File

@ -5,6 +5,7 @@
set -xeuo pipefail set -xeuo pipefail
. ${KOLA_EXT_DATA}/libinsttest.sh . ${KOLA_EXT_DATA}/libinsttest.sh
require_writable_sysroot
date date
cd /ostree/repo/tmp cd /ostree/repo/tmp

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

@ -71,6 +71,8 @@ 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"