d277205c13
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
58 lines
1.4 KiB
Bash
Executable File
58 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
set -euo pipefail
|
|
|
|
# Execute this code path on the host
|
|
if test -z "${INSIDE_VM:-}"; then
|
|
. ${commondir}/libvm.sh
|
|
vm_setup
|
|
|
|
if ! vm_ssh_wait 30; then
|
|
echo "ERROR: A running VM is required for 'make vmcheck'."
|
|
exit 1
|
|
fi
|
|
|
|
set -x
|
|
|
|
cd ${topsrcdir}
|
|
rm insttree -rf
|
|
DESTDIR=$(pwd)/insttree
|
|
make install DESTDIR=${DESTDIR}
|
|
for san in a t ub; do
|
|
if eu-readelf -d ${DESTDIR}/usr/libexec/rpm-ostreed | grep -q "NEEDED.*lib${san}san"; then
|
|
echo "Installing extra sanitizier: lib${san}san"
|
|
cp /usr/lib64/lib${san}san*.so.* ${DESTDIR}/usr/lib64
|
|
fi
|
|
done
|
|
vm_rsync
|
|
|
|
$SSH "env INSIDE_VM=1 /var/roothome/sync/tests/vmcheck/overlay.sh"
|
|
vm_reboot
|
|
exit 0
|
|
fi
|
|
|
|
set -x
|
|
|
|
# And then this code path in the VM
|
|
|
|
commit=$(rpm-ostree status --json | \
|
|
python -c '
|
|
import sys, json;
|
|
deployments = json.load(sys.stdin)["deployments"]
|
|
for deployment in deployments:
|
|
if deployment["booted"]:
|
|
print deployment["checksum"]
|
|
exit()')
|
|
|
|
if [[ -z $commit ]] || ! ostree rev-parse $commit; then
|
|
echo "Error while determining current commit" >&2
|
|
exit 1
|
|
fi
|
|
|
|
cd /ostree/repo/tmp
|
|
rm vmcheck -rf
|
|
ostree checkout $commit vmcheck --fsync=0
|
|
rsync -rlv /var/roothome/sync/insttree/usr/ vmcheck/usr/
|
|
ostree refs --delete vmcheck || true
|
|
ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup
|
|
ostree admin deploy vmcheck
|