summaryrefslogtreecommitdiff
path: root/yarns/deployment.yarn
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-23 10:44:41 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-25 17:01:40 +0000
commitd71d4824ef57a97266eebc11320cfb38295f484a (patch)
tree2665a131bcc670ca0a08fa86bca150628f15a04f /yarns/deployment.yarn
parentfcb02bf722b53eb9985f1efe04291894a9e42fcd (diff)
downloadmorph-d71d4824ef57a97266eebc11320cfb38295f484a.tar.gz
Rename an IMPLEMENTS that mentions system branch
Change-Id: I185377090ba837805b492f8dd1b31360843e9548
Diffstat (limited to 'yarns/deployment.yarn')
-rw-r--r--yarns/deployment.yarn8
1 files changed, 4 insertions, 4 deletions
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn
index a3a8a679..b159b68c 100644
--- a/yarns/deployment.yarn
+++ b/yarns/deployment.yarn
@@ -60,7 +60,7 @@ the same code paths as a real upgrade.
SCENARIO deploying a cluster morphology as rawdisk and then upgrading it
GIVEN a git server
- GIVEN a cluster called clusters/test-cluster.morph in system branch master
+ GIVEN a cluster called clusters/test-cluster.morph in branch master
AND a system in cluster clusters/test-cluster.morph in branch master called test-system
AND system test-system in cluster clusters/test-cluster.morph in branch master builds systems/test-system.morph
AND system test-system in cluster clusters/test-cluster.morph in branch master has deployment type: rawdisk
@@ -88,7 +88,7 @@ It is convenient to be able to deploy one system inside another.
SCENARIO deploying a cluster morphology with nested systems
GIVEN a git server
- GIVEN a cluster called test-cluster.morph in system branch master
+ GIVEN a cluster called test-cluster.morph in branch master
AND a system in cluster test-cluster.morph in branch master called test-system
AND system test-system in cluster test-cluster.morph in branch master builds systems/test-system.morph
AND system test-system in cluster test-cluster.morph in branch master has deployment type: tar
@@ -134,7 +134,7 @@ There's a few ways of creating an initramfs. We could:
SCENARIO deploying a system with an initramfs
ASSUMING there is space for 5 512M disk images
GIVEN a git server
- GIVEN a cluster called C.morph in system branch master
+ GIVEN a cluster called C.morph in branch master
AND a system in cluster C.morph in branch master called S
2.2 needs a nested system that is deployed with the initramfs write
@@ -211,7 +211,7 @@ with only one definition.
SCENARIO partially deploying a cluster morphology
GIVEN a git server
- GIVEN a cluster called test-cluster.morph in system branch master
+ GIVEN a cluster called test-cluster.morph in branch master
AND a system in cluster test-cluster.morph in branch master called test-system
AND system test-system in cluster test-cluster.morph in branch master builds systems/test-system.morph
AND system test-system in cluster test-cluster.morph in branch master has deployment type: tar