shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-23 21:35:26 +03:00
Code Issues Projects Releases Wiki Activity
a9df634c47
ostree/tests/test-admin-deploy-karg.sh

74 lines
3.6 KiB
Bash
Raw Normal View History

deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
#!/bin/bash
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
Add SPDX-License-Identifier to source files SPDX License List is a list of (common) open source licenses that can be referred to by a “short identifier”. It has several advantages compared to the common "license header texts" usually found in source files. Some of the advantages: * It is precise; there is no ambiguity due to variations in license header text * It is language neutral * It is easy to machine process * It is concise * It is simple and can be used without much cost in interpreted environments like java Script, etc. * An SPDX license identifier is immutable. * It provides simple guidance for developers who want to make sure the license for their code is respected See http://spdx.org for further reading. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Closes: #1439 Approved by: cgwalters
2018-01-30 22:26:26 +03:00
# SPDX-License-Identifier: LGPL-2.0+
#
deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
tests: Use "bash strict mode" I noticed in the static deltas tests, there were some tests that should have been under `-o pipefail` to ensure we properly propagate errors. There were a few places where we were referencing undefined variables. Overall, this is clearly a good idea IMO.
2016-01-27 19:44:10 +03:00
set -euo pipefail
deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
. $(dirname $0)/libtest.sh
tests: Export OSTREE_SYSROOT in setup_os_repository Eliminates the need for constantly passing --sysroot=sysroot, but also makes ostree place remote configs for sysroot/ostree/repo in sysroot/etc/ostree/remotes.d where they should have been all along.
2015-07-14 20:30:05 +03:00
# Exports OSTREE_SYSROOT so --sysroot not needed.
tree-wide: Replace archive-z2 with archive In almost all places. There are just a few exceptions; one tricky bit for example is that the repo config must still have `mode=archive-z2`, since `archive` used to mean something else. (We could very likely just get rid of that check, but eh, later). I also added a test that one can still do `ostree repo init --mode=archive-z2`. Closes: #1125 Approved by: jlebon
2017-09-01 23:15:33 +03:00
setup_os_repository "archive" "syslinux"
deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
tests: Port to glib-tap.mk, make `make check` run all of the tests OSTree's code for testing predates the `glib-tap.mk` making its way into GLib. Let's switch to it, as it provides a number of advantages. By far the biggest advantage is that `make check` can start to run most of the tests *in addition* to having them work installed. This commit keeps the installed tests working, but `make check` turns out to be really broken because...our TAP usage has bitrotted to say the least. Fix that all up. Do some hacks so that the tests work uninstalled as well - in particular, `glib-tap.mk` and the bits encoded into `g_test_build_filename()` assume *recursive* Automake (blah). Work around that by creating a symlink when installed to loop back.
2016-03-02 18:28:04 +03:00
echo "1..3"
deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
tests: prefix invocation of ostree with where missing And add a syntax rule to avoid this in future. Fixed by: sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-09 15:03:35 +03:00
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime
tests: enforce ${CMD_PREFIX} on all ostree processes Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-03-03 15:13:54 +03:00
rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime)
deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
export rev
# This initial deployment gets kicked off with some kernel arguments
tests: prefix invocation of ostree with where missing And add a syntax rule to avoid this in future. Fixed by: sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-09 15:03:35 +03:00
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
${CMD_PREFIX} ostree admin deploy --karg=FOO=BAR --os=testos testos:testos/buildmaster/x86_64-runtime
${CMD_PREFIX} ostree admin deploy --karg=TESTARG=TESTVALUE --os=testos testos:testos/buildmaster/x86_64-runtime
deploy: Change BootLoaderSpec filenames so they can be used for sorting Currently the BLS snippets are named ostree-$ID-$VARIANT_ID-$index.conf, but the BLS config files are actually sorted by using the version field which is the inverse of the index. In most places, _ostree_sysroot_read_boot_loader_configs() is used to get the BLS files and this function already returns them sorted by the version field. The only place where the index trailing number is used is in the ostree-grub-generator script that lists the BLS files to populate the grub config file. But for some bootloaders the BLS filename is the criteria for sorting by taking the filename as a string version. So on these bootloaders the BLS entries will be listed in the reverse order. To avoid that, change the BLS snippets filename to have the version field instead of the index and also to have the version before deployment name. Make the filenames to be of the form ostree-$version-$ID-$VARIANT_ID.conf so the version is before the deployment name. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Closes: #1654 Approved by: cgwalters
2018-06-27 17:45:43 +03:00
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=BAR'
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*FOO=BAR'
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*TESTARG=TESTVALUE'
tests: prefix invocation of ostree with where missing And add a syntax rule to avoid this in future. Fixed by: sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-09 15:03:35 +03:00
${CMD_PREFIX} ostree admin deploy --karg=ANOTHERARG=ANOTHERVALUE --os=testos testos:testos/buildmaster/x86_64-runtime
deploy: Change BootLoaderSpec filenames so they can be used for sorting Currently the BLS snippets are named ostree-$ID-$VARIANT_ID-$index.conf, but the BLS config files are actually sorted by using the version field which is the inverse of the index. In most places, _ostree_sysroot_read_boot_loader_configs() is used to get the BLS files and this function already returns them sorted by the version field. The only place where the index trailing number is used is in the ostree-grub-generator script that lists the BLS files to populate the grub config file. But for some bootloaders the BLS filename is the criteria for sorting by taking the filename as a string version. So on these bootloaders the BLS entries will be listed in the reverse order. To avoid that, change the BLS snippets filename to have the version field instead of the index and also to have the version before deployment name. Make the filenames to be of the form ostree-$version-$ID-$VARIANT_ID.conf so the version is before the deployment name. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Closes: #1654 Approved by: cgwalters
2018-06-27 17:45:43 +03:00
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*TESTARG=TESTVALUE'
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*ANOTHERARG=ANOTHERVALUE'
deploy: Write bootloader config even if just kernel arguments changed The official way to add bootloader arguments to the current deployment is to redeploy with --karg. However, doing so tripped up an optimization made inside the deployment code to just swap the bootlinks if we're keeping the same "bootcsum". Change this optimization to look at the pair of (bootcsum, options).
2014-01-15 17:46:05 +04:00
echo "ok deploy with --karg, but same config"
admin: Add --karg-proc-cmdline argument When installing a new tree inside an existing OS, this is a convenient way to include the command line arguments one needs (such as root=).
2014-01-13 17:45:56 +04:00
tests: prefix invocation of ostree with where missing And add a syntax rule to avoid this in future. Fixed by: sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-09 15:03:35 +03:00
${CMD_PREFIX} ostree admin deploy --karg-proc-cmdline --os=testos testos:testos/buildmaster/x86_64-runtime
tests: Improve check for /proc/cmdline kargs On some systems there may be no root= argument, so the tests for appending /proc/cmdline arguments will fail. Instead, loop over each of the arguments in the host's /proc/cmdline and test that they're in the constructed config file. That will actually test if ostree added all of the system's /proc/cmdline args correctly. The regex isn't perfect here, but it's probably good enough for this test. Closes: #372 Approved by: cgwalters
2016-05-13 22:53:01 +03:00
for arg in $(cat /proc/cmdline); do
tests: Fix karg tests on ostree-booted system https://github.com/ostreedev/ostree/pull/372 caused these tests to start failing when the host system is managed using ostree - since the tests *do* replace the `ostree=` kernel argument. Closes: #384 Approved by: cgwalters
2016-07-08 17:54:11 +03:00
case "$arg" in
ostree=*) # Skip ostree arg that gets stripped out
Filter bootloader supplied kernel cmdline options Various bootloader add kernel commandline options dynamically, filter these out when grabbing boot options from /proc/cmdline. Specifically grub adds BOOT_IMAGE and systemd-boot adds initrd. Closes: #560 Approved by: cgwalters
2016-10-30 23:06:27 +03:00
;;
initrd=*|BOOT_IMAGE=*) # Skip options set by bootloader that gets filtered out
tests: Fix karg tests on ostree-booted system https://github.com/ostreedev/ostree/pull/372 caused these tests to start failing when the host system is managed using ostree - since the tests *do* replace the `ostree=` kernel argument. Closes: #384 Approved by: cgwalters
2016-07-08 17:54:11 +03:00
;;
deploy: Change BootLoaderSpec filenames so they can be used for sorting Currently the BLS snippets are named ostree-$ID-$VARIANT_ID-$index.conf, but the BLS config files are actually sorted by using the version field which is the inverse of the index. In most places, _ostree_sysroot_read_boot_loader_configs() is used to get the BLS files and this function already returns them sorted by the version field. The only place where the index trailing number is used is in the ostree-grub-generator script that lists the BLS files to populate the grub config file. But for some bootloaders the BLS filename is the criteria for sorting by taking the filename as a string version. So on these bootloaders the BLS entries will be listed in the reverse order. To avoid that, change the BLS snippets filename to have the version field instead of the index and also to have the version before deployment name. Make the filenames to be of the form ostree-$version-$ID-$VARIANT_ID.conf so the version is before the deployment name. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Closes: #1654 Approved by: cgwalters
2018-06-27 17:45:43 +03:00
*) assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf "options.*$arg"
tests: Fix karg tests on ostree-booted system https://github.com/ostreedev/ostree/pull/372 caused these tests to start failing when the host system is managed using ostree - since the tests *do* replace the `ostree=` kernel argument. Closes: #384 Approved by: cgwalters
2016-07-08 17:54:11 +03:00
;;
esac
tests: Improve check for /proc/cmdline kargs On some systems there may be no root= argument, so the tests for appending /proc/cmdline arguments will fail. Instead, loop over each of the arguments in the host's /proc/cmdline and test that they're in the constructed config file. That will actually test if ostree added all of the system's /proc/cmdline args correctly. The regex isn't perfect here, but it's probably good enough for this test. Closes: #372 Approved by: cgwalters
2016-05-13 22:53:01 +03:00
done
admin: Add --karg-proc-cmdline argument When installing a new tree inside an existing OS, this is a convenient way to include the command line arguments one needs (such as root=).
2014-01-13 17:45:56 +04:00
echo "ok deploy --karg-proc-cmdline"
deploy: Rework kernel arguments, add --karg-append to "admin deploy" The "ordered hash" code was really just for kernel arguments. And it turns out it needs to be a multihash (for e.g. multiple console= arguments). So turn the OstreeOrderedHash into OstreeKernelArgs, and move the bits to split key=value and such into there. Now we're not making this public API yet - the public OstreeSysroot just takes char **kargs. To facilitate code reuse between ostree/ and libostree/, make it a noinst libtool library. It'll be duplicated in the binary and library, but that's OK for now. We can investigate making OstreeKernelArgs public later. https://bugzilla.gnome.org/show_bug.cgi?id=721136
2014-01-16 22:04:00 +04:00
tests: prefix invocation of ostree with where missing And add a syntax rule to avoid this in future. Fixed by: sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-09 15:03:35 +03:00
${CMD_PREFIX} ostree admin status
${CMD_PREFIX} ostree admin undeploy 0
deploy: Rework kernel arguments, add --karg-append to "admin deploy" The "ordered hash" code was really just for kernel arguments. And it turns out it needs to be a multihash (for e.g. multiple console= arguments). So turn the OstreeOrderedHash into OstreeKernelArgs, and move the bits to split key=value and such into there. Now we're not making this public API yet - the public OstreeSysroot just takes char **kargs. To facilitate code reuse between ostree/ and libostree/, make it a noinst libtool library. It'll be duplicated in the binary and library, but that's OK for now. We can investigate making OstreeKernelArgs public later. https://bugzilla.gnome.org/show_bug.cgi?id=721136
2014-01-16 22:04:00 +04:00
tests: prefix invocation of ostree with where missing And add a syntax rule to avoid this in future. Fixed by: sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2015-11-09 15:03:35 +03:00
${CMD_PREFIX} ostree admin deploy --os=testos --karg-append=APPENDARG=VALAPPEND --karg-append=APPENDARG=2NDAPPEND testos:testos/buildmaster/x86_64-runtime
deploy: Change BootLoaderSpec filenames so they can be used for sorting Currently the BLS snippets are named ostree-$ID-$VARIANT_ID-$index.conf, but the BLS config files are actually sorted by using the version field which is the inverse of the index. In most places, _ostree_sysroot_read_boot_loader_configs() is used to get the BLS files and this function already returns them sorted by the version field. The only place where the index trailing number is used is in the ostree-grub-generator script that lists the BLS files to populate the grub config file. But for some bootloaders the BLS filename is the criteria for sorting by taking the filename as a string version. So on these bootloaders the BLS entries will be listed in the reverse order. To avoid that, change the BLS snippets filename to have the version field instead of the index and also to have the version before deployment name. Make the filenames to be of the form ostree-$version-$ID-$VARIANT_ID.conf so the version is before the deployment name. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Closes: #1654 Approved by: cgwalters
2018-06-27 17:45:43 +03:00
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*FOO=BAR'
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*TESTARG=TESTVALUE'
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND'
deploy: Rework kernel arguments, add --karg-append to "admin deploy" The "ordered hash" code was really just for kernel arguments. And it turns out it needs to be a multihash (for e.g. multiple console= arguments). So turn the OstreeOrderedHash into OstreeKernelArgs, and move the bits to split key=value and such into there. Now we're not making this public API yet - the public OstreeSysroot just takes char **kargs. To facilitate code reuse between ostree/ and libostree/, make it a noinst libtool library. It'll be duplicated in the binary and library, but that's OK for now. We can investigate making OstreeKernelArgs public later. https://bugzilla.gnome.org/show_bug.cgi?id=721136
2014-01-16 22:04:00 +04:00
lib/kernel-args: Store kernel args as key/value entries Define an `OstreeKernelArgsEntry` structure, which holds both the key and the value. The kargs order array stores entries for each key/value pair, instead of just the keys. The hash table is used to locate entries, by storing entries in a pointer array for each key. The same public interface is preserved, while maintaining ordering information of each key/value pair when appending/replacing/deleting kargs. Fixes: #1859
2019-08-29 19:14:26 +03:00
# Check correct ordering of different-valued args of the same key.
${CMD_PREFIX} ostree admin deploy --os=testos --karg-append=FOO=TESTORDERED --karg-append=APPENDARG=3RDAPPEND testos:testos/buildmaster/x86_64-runtime
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND .*FOO=TESTORDERED .*APPENDARG=3RDAPPEND'
deploy: Rework kernel arguments, add --karg-append to "admin deploy" The "ordered hash" code was really just for kernel arguments. And it turns out it needs to be a multihash (for e.g. multiple console= arguments). So turn the OstreeOrderedHash into OstreeKernelArgs, and move the bits to split key=value and such into there. Now we're not making this public API yet - the public OstreeSysroot just takes char **kargs. To facilitate code reuse between ostree/ and libostree/, make it a noinst libtool library. It'll be duplicated in the binary and library, but that's OK for now. We can investigate making OstreeKernelArgs public later. https://bugzilla.gnome.org/show_bug.cgi?id=721136
2014-01-16 22:04:00 +04:00
echo "ok deploy --karg-append"
Reference in New Issue Copy Permalink