9d9042d835
1. Don't require an ssh-config In the case of redhat-ci, the VMs are already fully configured for the system (injected in the hosts file, host key accepted, etc...). So there's no need to have an ssh-config there. In general, it should be acceptable to run the vmcheck suite against a resolvable host without having to create an ssh-config for it. 2. Make the host name configurable Rather than hardcoding "vmcheck" as the hostname, allow overridding it by specifying a VM env var directly. We also prepare the various scripts to make use of the $VM variable whenever host-specific dirs/files are created so that parallel runs won't step on each other. Closes: #675 Approved by: cgwalters
78 lines
2.2 KiB
Bash
Executable File
78 lines
2.2 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}
|
|
|
|
# Use a lock in case we're called in parallel (make install might fail).
|
|
# Plus, we can just share the same install tree, and sharing is caring!
|
|
flock insttree.lock sh -ec \
|
|
'[ ! -d insttree ] || exit 0
|
|
DESTDIR=$(pwd)/insttree
|
|
make install DESTDIR=${DESTDIR}
|
|
for san in a t ub; do
|
|
if eu-readelf -d ${DESTDIR}/usr/bin/rpm-ostree | \
|
|
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
|
|
touch ${DESTDIR}/.completed'
|
|
[ -f insttree/.completed ]
|
|
|
|
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/
|
|
# ✀✀✀ BEGIN hack for https://github.com/projectatomic/rpm-ostree/pull/642 ✀✀✀
|
|
ostree admin unlock || true
|
|
for url in https://kojipkgs.fedoraproject.org//packages/ostree/2017.2/3.fc25/x86_64/ostree-{,libs-,grub2-}2017.2-3.fc25.x86_64.rpm; do
|
|
curl -sSL -O $url
|
|
done
|
|
rpm -Uvh --force *.rpm
|
|
for x in *.rpm; do
|
|
rpm2cpio $x | (cd vmcheck && cpio -div)
|
|
done
|
|
rm vmcheck/etc -rf
|
|
rm -f *.rpm
|
|
# ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/642 ✀✀✀
|
|
ostree refs --delete vmcheck || true
|
|
ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup
|
|
ostree admin deploy vmcheck
|