diff --git a/tests/vmcheck/overlay.sh b/tests/vmcheck/overlay.sh index f9b600592d..3af15526f0 100755 --- a/tests/vmcheck/overlay.sh +++ b/tests/vmcheck/overlay.sh @@ -62,19 +62,8 @@ ostree checkout $commit vmcheck --fsync=0 # ✀✀✀ BEGIN hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀ rm -f vmcheck/usr/etc/{.pwd.lock,passwd-,group-,shadow-,gshadow-,subuid-,subgid-} # ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀ +# Now, overlay our built binaries 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