diff options
| author | Daniel Firth <dan.firth@codethink.co.uk> | 2013-10-11 10:23:10 +0100 |
|---|---|---|
| committer | Daniel Firth <dan.firth@codethink.co.uk> | 2013-10-11 10:23:10 +0100 |
| commit | 090d21ed8e9cb7bd640c2632217399dc72e0df0a (patch) | |
| tree | 448d007f74b52b61bd5ee8513c19dbe1b30848b6 /tests.deploy | |
| parent | 764a5070e63b417ac38922bdd0bfdefe707f692a (diff) | |
| parent | b30e50942b77a6bebdf8a74bd118cd2f06744abd (diff) | |
| download | morph-090d21ed8e9cb7bd640c2632217399dc72e0df0a.tar.gz | |
Merge branch 'danielfirth/RT219'
Reviewed by Lars Wirzenius
Reviewd by Richard Ipsum
Diffstat (limited to 'tests.deploy')
| -rwxr-xr-x | tests.deploy/deploy-cluster.script | 12 | ||||
| -rwxr-xr-x | tests.deploy/deploy-rawdisk.script | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tests.deploy/deploy-cluster.script b/tests.deploy/deploy-cluster.script index 917ac717..0efc8d3c 100755 --- a/tests.deploy/deploy-cluster.script +++ b/tests.deploy/deploy-cluster.script @@ -18,7 +18,6 @@ # Test "morph deploy" by deploying the systems in cluster morphology. - set -eu @@ -35,12 +34,13 @@ cd "$DATADIR/workspace/branch1" linux-system-2.HOSTNAME="baserock-rocks-even-more" \ > /dev/null -test -e hello-system.img -test -e linux-system-1.tar -test -e linux-system-2.tar +outputdir=test:morphs +test -e $outputdir/hello-system.img +test -e $outputdir/linux-system-1.tar +test -e $outputdir/linux-system-2.tar -hostname1=$(tar -xf linux-system-1.tar ./etc/hostname -O) -hostname2=$(tar -xf linux-system-2.tar ./etc/hostname -O) +hostname1=$(tar -xf $outputdir/linux-system-1.tar ./etc/hostname -O) +hostname2=$(tar -xf $outputdir/linux-system-2.tar ./etc/hostname -O) [ "$hostname1" = baserock-rocks ] [ "$hostname2" = baserock-rocks-even-more ] diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script index ebda50c7..257ef0dd 100755 --- a/tests.deploy/deploy-rawdisk.script +++ b/tests.deploy/deploy-rawdisk.script @@ -27,5 +27,7 @@ cd "$DATADIR/workspace/branch1" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \ deploy rawdisk_test_cluster > /dev/null -test -e disk.img + +outputdir="test:morphs" +test -e $outputdir/disk.img |