tests: Extend staging to cover vmcheck/upgrades

This now works after https://github.com/ostreedev/ostree/pull/1570

However, I was hitting an issue with the temp httpd running the
tests serially, let's split them up.

Really the only sane thing is to run each of these tests in a fresh
VM; we'll do the VM-in-container pattern here hopefully soon.

Closes: #1355
Approved by: jlebon

tests/vmcheck/test-meta-staged-layering-relayer.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Copyright (C) 2018 Red Hat
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+set -euo pipefail
+
+dn=$(cd $(dirname $0) && pwd)
+
+. ${commondir}/libtest.sh
+. ${commondir}/libvm.sh
+
+set -x
+
+# This test suite enables the libostree staging feature, and executes
+# the layering-relayer tests.
+
+export VMCHECK_FLAGS=stage-deployments
+vm_cmd 'echo "[Experimental]" >> /etc/rpm-ostreed.conf'
+vm_cmd 'echo StageDeployments=true >> /etc/rpm-ostreed.conf'
+vm_rpmostree reload
+
+${dn}/test-layering-relayer.sh
+echo "meta-ok layering-relayer"

tests/vmcheck/test-meta-staged-upgrades.sh

@@ -34,6 +34,5 @@ vm_cmd 'echo "[Experimental]" >> /etc/rpm-ostreed.conf'
 vm_cmd 'echo StageDeployments=true >> /etc/rpm-ostreed.conf'
 vm_rpmostree reload
 
-#${dn}/test-upgrades.sh
-
-${dn}/test-layering-relayer.sh
+${dn}/test-upgrades.sh
+echo "meta-ok upgrades"

tests/vmcheck/test-upgrades.sh

@@ -49,7 +49,7 @@ vm_assert_status_jq ".deployments[0][\"booted\"]" \
                     ".deployments[0][\"version\"] == \"v2\""
 echo "ok upgrade"
 
-vm_cmd ostree remote add otherremote --no-gpg-verify http://localhost:8888/
+vm_cmd ostree remote add otherremote --if-not-exists --no-gpg-verify http://localhost:8888/
 vm_rpmostree reload
 vm_rpmostree rebase otherremote:
 vm_assert_status_jq ".deployments[0][\"origin\"] == \"otherremote:vmcheck\"" \