From c5fa202378f44a86d25b44db0174d5dc9194aa66 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 20 Dec 2016 23:22:03 -0500 Subject: [PATCH] sync.sh: tweak for container workflow 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 --- tests/vmcheck/overlay.sh | 3 +-- tests/vmcheck/sync.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/vmcheck/overlay.sh b/tests/vmcheck/overlay.sh index 27575b7f..d858a09a 100755 --- a/tests/vmcheck/overlay.sh +++ b/tests/vmcheck/overlay.sh @@ -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 diff --git a/tests/vmcheck/sync.sh b/tests/vmcheck/sync.sh index dc765746..f063c1cd 100755 --- a/tests/vmcheck/sync.sh +++ b/tests/vmcheck/sync.sh @@ -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