keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Actually install the new binaries

Browse Source 
I think since I landed a change to `--enable-new-name`, `/usr/bin/rpm-ostree`
became a symlink, and without the `-l` switch, rsync skips over them.

Hence, we have only been testing in vmcheck the old binaries, not new ones.
Oops.

Closes: #585
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-01-19 13:21:14 -05:00 committed by Atomic Bot
parent 02166aeecd
commit d277205c13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/vmcheck/overlay.sh
View File

@ -51,7 +51,7 @@ fi
cd /ostree/repo/tmp cd /ostree/repo/tmp
rm vmcheck -rf rm vmcheck -rf
ostree checkout $commit vmcheck --fsync=0 ostree checkout $commit vmcheck --fsync=0
rsync -rv /var/roothome/sync/insttree/usr/ vmcheck/usr/ rsync -rlv /var/roothome/sync/insttree/usr/ vmcheck/usr/
ostree refs --delete vmcheck || true ostree refs --delete vmcheck || true
ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup
ostree admin deploy vmcheck ostree admin deploy vmcheck

2
tests/vmcheck/sync.sh
View File

@ -26,7 +26,7 @@ else
# then do this in the VM # then do this in the VM
set -x set -x
ostree admin unlock || : ostree admin unlock || :
rsync -rv /var/roothome/sync/insttree/usr/ /usr/ rsync -rlv /var/roothome/sync/insttree/usr/ /usr/
restorecon /usr/libexec/rpm-ostreed restorecon /usr/libexec/rpm-ostreed
systemctl restart rpm-ostreed systemctl restart rpm-ostreed
fi fi