diff options
| author | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:42:37 +0200 |
|---|---|---|
| committer | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:55:03 +0200 |
| commit | 02527f115e934d40a37a4b2b41f1a93eaf70732b (patch) | |
| tree | b08b769dbb945d65eb0faebbbf07cc836f7a01d6 /tests/test-admin-deploy-none.sh | |
| parent | b8cca6cef14716987bbf7ef8f6edcbfc1688cc4c (diff) | |
| download | ostree-02527f115e934d40a37a4b2b41f1a93eaf70732b.tar.gz | |
*: rename master to main in tests & examples
Diffstat (limited to 'tests/test-admin-deploy-none.sh')
| -rwxr-xr-x | tests/test-admin-deploy-none.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-admin-deploy-none.sh b/tests/test-admin-deploy-none.sh index 09dee624..982addbe 100755 --- a/tests/test-admin-deploy-none.sh +++ b/tests/test-admin-deploy-none.sh @@ -34,12 +34,12 @@ extra_admin_tests=1 cd ${test_tmpdir} rm httpd osdata testos-repo sysroot -rf setup_os_repository "archive" "sysroot.bootloader none" -${CMD_PREFIX} ostree pull-local --repo=sysroot/ostree/repo --remote testos testos-repo testos/buildmaster/x86_64-runtime +${CMD_PREFIX} ostree pull-local --repo=sysroot/ostree/repo --remote testos testos-repo testos/buildmain/x86_64-runtime # Test that configuring sysroot.bootloader="none" is a workaround for previous # grub2 bootloader issue (see https://github.com/ostreedev/ostree/issues/1774) mkdir -p sysroot/boot/grub2 touch sysroot/boot/grub2/grub.cfg -${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os testos testos/buildmaster/x86_64-runtime > out.txt +${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os testos testos/buildmain/x86_64-runtime > out.txt assert_file_has_content out.txt "Bootloader updated.*" assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* root=LABEL=MOO' assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/vmlinuz-3.6.0 'a kernel' |