Skip to content

Commit

Permalink
tests/kolainst: don't use apply-live in with state overlays
Browse files Browse the repository at this point in the history
That combination does not work yet:

coreos#4810 (comment)
  • Loading branch information
jlebon committed Feb 21, 2024
1 parent 0b5b860 commit d24462b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
7 changes: 7 additions & 0 deletions tests/kolainst/destructive/apply-live
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ set -x

cd $(mktemp -d)

# apply-live is not yet compatible with state overlays
# https://github.com/coreos/rpm-ostree/pull/4810#issuecomment-1939351259
if jq -e '.["opt-usrlocal-overlays"]' /usr/share/rpm-ostree/treefile.json; then
echo "skip apply-live does not work currently with state overlays"
exit 0
fi

case "${AUTOPKGTEST_REBOOT_MARK:-}" in
"")

Expand Down
10 changes: 9 additions & 1 deletion tests/kolainst/destructive/cliwrap
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ libtest_prepare_offline
libtest_enable_repover 0
cd $(mktemp -d)

case "${AUTOPKGTEST_REBOOT_MARK:-}" in
"")
rpm-ostree deploy --ex-cliwrap=true
rpm-ostree apply-live # yep it works!
/tmp/autopkgtest-reboot 1
;;

1)
wrapdir="/usr/libexec/rpm-ostree/wrapped"
if ! test -d "${wrapdir}"; then
fatal "Missing ${wrapdir}"
Expand Down Expand Up @@ -67,3 +71,7 @@ rpm -qa >/dev/null
rpm --verify bash >out.txt || true
assert_not_file_has_content "ostree-based"
echo "ok cliwrap undo"
;;

*) echo "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}"; exit 1;;
esac

0 comments on commit d24462b

Please sign in to comment.