rpm-ostree/tests/vmcheck/sync.sh

#!/bin/bash
set -euo pipefail

if test -z "${INSIDE_VM:-}"; then

    # do this in the host
    . ${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}
    export VMCHECK_INSTTREE=${VMCHECK_INSTTREE:-$(pwd)/insttree}
    make install DESTDIR=${VMCHECK_INSTTREE}
    vm_rsync

    $SSH "env INSIDE_VM=1 /var/roothome/sync/tests/vmcheck/sync.sh"
    exit 0
else

    # then do this in the VM
    set -x
    ostree admin unlock || :
    rsync -rlv /var/roothome/sync/insttree/usr/ /usr/
    restorecon -v /usr/bin/rpm-ostree
    restorecon -v /usr/libexec/rpm-ostreed
    systemctl restart rpm-ostreed
fi
Redo `vmcheck` to abstract over ssh-config, drop all building My development environment is now using "pet" docker containers. I use VMs for testing things that require that (like rpm-ostree). This patch builds on work from @jlebon in https://github.com/projectatomic/rpm-ostree/pull/509 to rework `vmcheck` such that it can work on any `ssh-config`. By default we expect this to be Vagrant. However, I go a lot farther and delete the `vmbuild` code that was trying to do builds in a container on the target VM. I think this is still worth pursuing at some point, but for now I think it's reasonable to assume that the rpm-ostree developer audience uses Linux as their host workstation and hence has containers. (There's another important point here in that for developing lower level things like rpm-ostree, there's a strong push to make the VM disposable and not a pet) Closes: #516 Approved by: jlebon 2016-11-14 20:07:43 +03:00			`#!/bin/bash`
			`set -euo pipefail`

vmcheck: adapt for non-vagrant hosts This is just the final bit required to make sure the vagrant and non-vagrant paths can work happily together. It's mostly minor fixes, though the most major change which also affects vagrant is that we now sync to the root home dir, rather than ~vagrant. Closes: #524 Approved by: cgwalters 2016-11-22 06:22:51 +03:00			`if test -z "${INSIDE_VM:-}"; then`
Redo `vmcheck` to abstract over ssh-config, drop all building My development environment is now using "pet" docker containers. I use VMs for testing things that require that (like rpm-ostree). This patch builds on work from @jlebon in https://github.com/projectatomic/rpm-ostree/pull/509 to rework `vmcheck` such that it can work on any `ssh-config`. By default we expect this to be Vagrant. However, I go a lot farther and delete the `vmbuild` code that was trying to do builds in a container on the target VM. I think this is still worth pursuing at some point, but for now I think it's reasonable to assume that the rpm-ostree developer audience uses Linux as their host workstation and hence has containers. (There's another important point here in that for developing lower level things like rpm-ostree, there's a strong push to make the VM disposable and not a pet) Closes: #516 Approved by: jlebon 2016-11-14 20:07:43 +03:00
vmcheck: adapt for non-vagrant hosts This is just the final bit required to make sure the vagrant and non-vagrant paths can work happily together. It's mostly minor fixes, though the most major change which also affects vagrant is that we now sync to the root home dir, rather than ~vagrant. Closes: #524 Approved by: cgwalters 2016-11-22 06:22:51 +03:00			`# do this in the host`
			`. ${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`

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 2016-12-21 07:22:03 +03:00			`cd ${topsrcdir}`
vmcheck: Support VMCHECK_INSTTREE I need to build ostree from git too. So now my workflow is: ``` export insttree=/srv/walters/tmp/rootfs cd ostree make && make install DESTDIR=${insttree} cd rpm-ostree make && make install DESTDIR=${insttree} env VMCHECK_INSTTREE=${insttree} make vmoverlay ``` Closes: #705 Approved by: jlebon 2017-03-23 20:57:56 +03:00			`export VMCHECK_INSTTREE=${VMCHECK_INSTTREE:-$(pwd)/insttree}`
			`make install DESTDIR=${VMCHECK_INSTTREE}`
vmcheck: adapt for non-vagrant hosts This is just the final bit required to make sure the vagrant and non-vagrant paths can work happily together. It's mostly minor fixes, though the most major change which also affects vagrant is that we now sync to the root home dir, rather than ~vagrant. Closes: #524 Approved by: cgwalters 2016-11-22 06:22:51 +03:00			`vm_rsync`

			`$SSH "env INSIDE_VM=1 /var/roothome/sync/tests/vmcheck/sync.sh"`
			`exit 0`
			`else`

			`# then do this in the VM`
			`set -x`
			`ostree admin unlock \|\| :`
tests: Actually install the new binaries I think since I landed a change to `--enable-new-name`, `/usr/bin/rpm-ostree` became a symlink, and without the `-l` switch, rsync skips over them. Hence, we have only been testing in vmcheck the old binaries, not new ones. Oops. Closes: #585 Approved by: jlebon 2017-01-19 21:21:14 +03:00			`rsync -rlv /var/roothome/sync/insttree/usr/ /usr/`
Merge daemon binary into main binary The actual problem I am trying to fix with this is fallout from the introduction of `/usr/libexec/rpm-ostreed`, which required a SELinux policy change. Specifically for CentOS, the base policy is rev'd slowly. My hope was that by merging the daemon code back into `/usr/bin/rpm-ostree` which is labeled `install_exec_t`, starting via systemd would do the right thing. It turns out that doesn't happen. Now later, I'm picking this patch back up because I want to do multprocessing in the daemon (and in the core), and it makes sense to share code between them, because multiprocessing will need to go through a re-exec path. Another benefit is we avoid duplicated text (libglnx, internal helpers) between the two binaries. Closes: #292 Approved by: jlebon 2016-05-27 21:46:46 +03:00			`restorecon -v /usr/bin/rpm-ostree`
			`restorecon -v /usr/libexec/rpm-ostreed`
vmcheck: adapt for non-vagrant hosts This is just the final bit required to make sure the vagrant and non-vagrant paths can work happily together. It's mostly minor fixes, though the most major change which also affects vagrant is that we now sync to the root home dir, rather than ~vagrant. Closes: #524 Approved by: cgwalters 2016-11-22 06:22:51 +03:00			`systemctl restart rpm-ostreed`
			`fi`