diff options
author | Jonathan Lebon <jlebon@redhat.com> | 2017-08-23 12:15:46 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-25 01:02:15 +0000 |
commit | 9342be6e34b26891c38b671ec285bdcbc9107acd (patch) | |
tree | 0f91f5606ecb11213356aa9424f468d672a6f8d2 /tests/test-admin-deploy-grub2.sh | |
parent | d0f40a6af8fb391d5ee34ca6d4bc2abfc5b21e16 (diff) | |
download | ostree-9342be6e34b26891c38b671ec285bdcbc9107acd.tar.gz |
ostree-sysroot: make simple_write_deployment smarter
This is a follow-up to https://github.com/ostreedev/ostree/pull/1097.
We make simple_write_deployment smart enough so that it can be used for
rpm-ostree's purposes. This is mostly an upstreaming of logic that
already existed there.
Notably we correctly append NOT_DEFAULT deployments *after* the booted
deployment and we now support RETAIN_PENDING and RETAIN_ROLLBACK flags
to have more granularity on deployment pruning.
Expose these new flags on the CLI using new options (as well as expose
the previously existing NOT_DEFAULT flag as --not-as-default).
I couldn't add tests for --retain-pending because the merge deployment
is always the topmost one. Though I did check that it worked in a VM.
Closes: #1110
Approved by: cgwalters
Diffstat (limited to 'tests/test-admin-deploy-grub2.sh')
-rwxr-xr-x | tests/test-admin-deploy-grub2.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-admin-deploy-grub2.sh b/tests/test-admin-deploy-grub2.sh index 6f785df5..60c7d05f 100755 --- a/tests/test-admin-deploy-grub2.sh +++ b/tests/test-admin-deploy-grub2.sh @@ -19,11 +19,11 @@ set -euo pipefail -echo "1..19" - . $(dirname $0)/libtest.sh # Exports OSTREE_SYSROOT so --sysroot not needed. setup_os_repository "archive-z2" "grub2 ostree-grub-generator" +extra_admin_tests=0 + . $(dirname $0)/admin-test.sh |