shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity
ostree/tests/test-admin-deploy-karg.sh

66 lines
3.2 KiB
Bash
Raw Permalink 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 08:46:05 -05:00
#!/bin/bash
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
# 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 11:44:10 -05: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 08:46:05 -05:00
. $(dirname $0)/libtest.sh
echo "1..1"
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 13:30:05 -04:00
# Exports OSTREE_SYSROOT so --sysroot not needed.
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 08:46:05 -05:00
setup_os_repository "archive-z2" "syslinux"
echo "ok setup"
echo "1..1"
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 13:03:35 +01: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 13:13:54 +01: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 08:46:05 -05: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 13:03:35 +01: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: 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 08:46:05 -05:00
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-1.conf 'options.*FOO=BAR'
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAR'
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.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 13:03:35 +01:00
${CMD_PREFIX} ostree admin deploy --karg=ANOTHERARG=ANOTHERVALUE --os=testos testos: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 08:46:05 -05:00
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*ANOTHERARG=ANOTHERVALUE'
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 08:45:56 -05: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 13:03:35 +01:00
${CMD_PREFIX} ostree admin deploy --karg-proc-cmdline --os=testos testos:testos/buildmaster/x86_64-runtime
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 08:45:56 -05:00
# Here we're asserting that the *host* system has a root= kernel
# argument. I think it's unlikely that anyone doesn't have one, but
# if this is not true for you, please file a bug!
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*root=.'
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 13:04:00 -05: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 13:03:35 +01: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 13:04:00 -05: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 13:03:35 +01:00
${CMD_PREFIX} ostree admin deploy --os=testos --karg-append=APPENDARG=VALAPPEND --karg-append=APPENDARG=2NDAPPEND testos:testos/buildmaster/x86_64-runtime
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 13:04:00 -05:00
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAR'
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND'
echo "ok deploy --karg-append"
Reference in New Issue Copy Permalink