diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2015-03-03 13:13:54 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-03-03 18:32:24 -0500 |
| commit | aea173b3f8845948006e3ac4a157f8f31d9ef5fb (patch) | |
| tree | 7cd3f8025e65a025a2b2afe76b514b5fb63b73c5 /tests/test-admin-upgrade-unconfigured.sh | |
| parent | 948327fb675baa28f06becea39008a7e8994a8e4 (diff) | |
| download | ostree-aea173b3f8845948006e3ac4a157f8f31d9ef5fb.tar.gz | |
tests: enforce ${CMD_PREFIX} on all ostree processes
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'tests/test-admin-upgrade-unconfigured.sh')
| -rw-r--r-- | tests/test-admin-upgrade-unconfigured.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test-admin-upgrade-unconfigured.sh b/tests/test-admin-upgrade-unconfigured.sh index 821fa101..b7f6b6ce 100644 --- a/tests/test-admin-upgrade-unconfigured.sh +++ b/tests/test-admin-upgrade-unconfigured.sh @@ -29,23 +29,23 @@ echo "ok setup" echo "1..2" -ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime -rev=$(ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) +${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime +rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) export rev echo "rev=${rev}" # This initial deployment gets kicked off with some kernel arguments -ostree admin --sysroot=sysroot deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime +${CMD_PREFIX} ostree admin --sysroot=sysroot deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime echo "unconfigured-state=Use \"subscription-manager\" to enable online updates for example.com OS" >> sysroot/ostree/deploy/testos/deploy/${rev}.0.origin -ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime -if ostree admin --sysroot=sysroot upgrade --os=testos 2>err.txt; then +${CMD_PREFIX} ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime +if ${CMD_PREFIX} ostree admin --sysroot=sysroot upgrade --os=testos 2>err.txt; then assert_not_reached "upgrade unexpectedly succeeded" fi assert_file_has_content err.txt "Use.*subscription.*online" echo "ok error" -ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false otheros file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime -ostree admin --sysroot=sysroot switch --os=testos otheros:testos/buildmaster/x86_64-runtime +${CMD_PREFIX} ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false otheros file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime +${CMD_PREFIX} ostree admin --sysroot=sysroot switch --os=testos otheros:testos/buildmaster/x86_64-runtime echo "ok switch" |