summaryrefslogtreecommitdiff
path: root/tests.deploy/deploy-cluster.script
diff options
context:
space:
mode:
Diffstat (limited to 'tests.deploy/deploy-cluster.script')
-rwxr-xr-xtests.deploy/deploy-cluster.script10
1 files changed, 2 insertions, 8 deletions
diff --git a/tests.deploy/deploy-cluster.script b/tests.deploy/deploy-cluster.script
index 0659ad21..acc65a54 100755
--- a/tests.deploy/deploy-cluster.script
+++ b/tests.deploy/deploy-cluster.script
@@ -20,12 +20,6 @@
set -eu
-# DISABLED TEST: This does not seem to have been tested at merge time,
-# in a clean repository. The tests produces output (see below for
-# definitions-version), but the expected output is empty.
-# FIXME: This should be fixed.
-exit
-
. "$SRCDIR/tests.deploy/setup-build"
cd "$DATADIR/workspace/branch1"
@@ -34,7 +28,7 @@ cd "$DATADIR/workspace/branch1"
"$SRCDIR/scripts/test-morph" build linux-system
-GIT_DIR=test:morphs/.git git tag -a my-test-tag -m "Example tag" HEAD
+GIT_DIR=test/morphs/.git git tag -a my-test-tag -m "Example tag" HEAD
"$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \
deploy test_cluster \
@@ -42,7 +36,7 @@ GIT_DIR=test:morphs/.git git tag -a my-test-tag -m "Example tag" HEAD
linux-system-2.HOSTNAME="baserock-rocks-even-more" \
> /dev/null
-outputdir=test:morphs
+outputdir=test/morphs
test -e $outputdir/hello-system.img
test -e $outputdir/linux-system-1.tar
test -e $outputdir/linux-system-2.tar