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

sync.sh: tweak for container workflow

Browse Source 
In the container build + vagrant test workflow, we have to run `make
vmsync` from the env in which autoconf was run, which is the container.

However, when using git worktrees (which is useful in this scenario to
avoid having to overwrite your local builds) and a CentOS build
container, the git inside is too old to understand worktrees, so let's
avoid invoking git in any of the test harness scripts.

Also make sure to restorecon after installing the new rpm-ostreed.

Closes: #555
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2016-12-20 23:22:03 -05:00 committed by Atomic Bot
parent 2f68c02e1a
commit c5fa202378
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/vmcheck/overlay.sh
View File

@ -13,8 +13,7 @@ if test -z "${INSIDE_VM:-}"; then
set -x
topdir=$(git rev-parse --show-toplevel)
cd ${topdir}
cd ${topsrcdir}
rm insttree -rf
make install DESTDIR=$(pwd)/insttree
vm_rsync

4
tests/vmcheck/sync.sh
View File

@ -14,8 +14,7 @@ if test -z "${INSIDE_VM:-}"; then
set -x
topdir=$(git rev-parse --show-toplevel)
cd ${topdir}
cd ${topsrcdir}
rm insttree -rf
make install DESTDIR=$(pwd)/insttree
vm_rsync
@ -28,5 +27,6 @@ else
set -x
ostree admin unlock || :
rsync -rv /var/roothome/sync/insttree/usr/ /usr/
restorecon /usr/libexec/rpm-ostreed
systemctl restart rpm-ostreed
fi