Skip to content

Commit

Permalink
vmcheck: Drop hack for updating ostree
Browse files Browse the repository at this point in the history
The version in the current release has the fix.

Closes: #698
Approved by: jlebon
  • Loading branch information
cgwalters authored and rh-atomic-bot committed Mar 22, 2017
1 parent eaced1b commit 1c42102
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions tests/vmcheck/overlay.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 1c42102

Please sign in to comment.