summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-10 15:54:43 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 10:54:54 +0000
commita9e19c96b345106a6bc564271d02d094b67bd10c (patch)
treef5c20aa3f0a3ba5001fe9ebf073df87ec8181970
parentf9c5734d5014ed5a794ddcf54ed2ad03bdf392ad (diff)
downloadmorph-a9e19c96b345106a6bc564271d02d094b67bd10c.tar.gz
yarns: set deployment name based on system name
-rw-r--r--yarns/deployment.yarn9
-rw-r--r--yarns/implementations.yarn2
-rw-r--r--yarns/regression.yarn2
-rw-r--r--yarns/splitting.yarn2
4 files changed, 8 insertions, 7 deletions
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn
index f98d2751..c8bfc68f 100644
--- a/yarns/deployment.yarn
+++ b/yarns/deployment.yarn
@@ -15,7 +15,7 @@ Morph Deployment Tests
WHEN the user checks out the system branch called master
GIVEN a cluster called test-cluster for deploying only the test-system system as type tar in system branch master
WHEN the user builds the system test-system in branch master
- AND the user attempts to deploy the cluster test-cluster in branch master with options system.location=test.tar
+ AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.location=test.tar
THEN morph succeeded
Some deployment types support upgrades, but some do not and Morph needs to make
@@ -27,7 +27,7 @@ this clear.
WHEN the user checks out the system branch called master
GIVEN a cluster called test-cluster for deploying only the test-system system as type tar in system branch master
WHEN the user builds the system test-system in branch master
- AND the user attempts to upgrade the cluster test-cluster in branch master with options system.location=test.tar
+ AND the user attempts to upgrade the cluster test-cluster in branch master with options test-system.location=test.tar
THEN morph failed
The rawdisk write extension supports both initial deployment and subsequent
@@ -42,6 +42,7 @@ the same code paths as a real upgrade.
WHEN the user checks out the system branch called master
GIVEN a cluster called test-cluster for deploying only the test-system system as type rawdisk in system branch master
WHEN the user builds the system test-system in branch master
- AND the user attempts to deploy the cluster test-cluster in branch master with options system.location=test.img system.DISK_SIZE=10M system.VERSION_LABEL=test1
- AND the user attempts to upgrade the cluster test-cluster in branch master with options system.location=test.img system.VERSION_LABEL=test2
+ AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.location=test.img test-system.DISK_SIZE=10M test-system.VERSION_LABEL=test1
+ THEN morph succeeded
+ WHEN the user attempts to upgrade the cluster test-cluster in branch master with options test-system.location=test.img test-system.VERSION_LABEL=test2
THEN morph succeeded
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 3e5b3ab5..71a782f3 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -692,7 +692,7 @@ with only the minimal information.
repo: test:morphs
ref: $branch
deploy:
- system:
+ $system:
type: $type
EOF
diff --git a/yarns/regression.yarn b/yarns/regression.yarn
index d8eedea2..17e3ad87 100644
--- a/yarns/regression.yarn
+++ b/yarns/regression.yarn
@@ -62,7 +62,7 @@ source it depended on.
WHEN the user builds the system test-system in branch master
GIVEN stratum test-stratum in system branch master has match rules: [{artifact: test-stratum-runtime, include: [.*-(bins|libs|misc)]}, {artifact: test-stratum-devel, include: [.*-(devel|doc|locale)]}]
WHEN the user builds the system test-system in branch master
- AND the user deploys the cluster test-cluster in branch master with options system.location="$DATADIR/test.tar"
+ AND the user deploys the cluster test-cluster in branch master with options test-system.location="$DATADIR/test.tar"
THEN tarball test.tar contains baserock/test-chunk-misc.meta
diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn
index 3da397f5..a1b5e565 100644
--- a/yarns/splitting.yarn
+++ b/yarns/splitting.yarn
@@ -49,7 +49,7 @@ its contents.
GIVEN a cluster called test-cluster for deploying only the test-system system as type tar in system branch master
WHEN the user builds the system test-system in branch master
- AND the user attempts to deploy the cluster test-cluster in branch master with options system.location="$DATADIR/test.tar"
+ AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.location="$DATADIR/test.tar"
The -runtime artifacts include executables and shared libraries.