summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-23 10:44:41 (GMT)
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-25 17:01:40 (GMT)
commitd71d4824ef57a97266eebc11320cfb38295f484a (patch)
tree2665a131bcc670ca0a08fa86bca150628f15a04f
parentfcb02bf722b53eb9985f1efe04291894a9e42fcd (diff)
downloadmorph-d71d4824ef57a97266eebc11320cfb38295f484a.tar.gz
Rename an IMPLEMENTS that mentions system branch
Change-Id: I185377090ba837805b492f8dd1b31360843e9548
-rw-r--r--yarns/building.yarn4
-rw-r--r--yarns/deployment.yarn8
-rw-r--r--yarns/implementations.yarn2
-rw-r--r--yarns/regression.yarn2
-rw-r--r--yarns/splitting.yarn2
5 files changed, 9 insertions, 9 deletions
diff --git a/yarns/building.yarn b/yarns/building.yarn
index 363d496..d2cd0c2 100644
--- a/yarns/building.yarn
+++ b/yarns/building.yarn
@@ -51,7 +51,7 @@ up libraries more quickly.
In our example, we have a system integration that creates /etc/passwd,
so when we deploy the system, we can check whether it exists.
- 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: tar
@@ -82,7 +82,7 @@ lets you download the artifacts for local use.
Note: Currently broken. It's currently complaining about not having
repos cached locally.
-> 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/base-system.morph
> AND system test-system in cluster test-cluster.morph in branch master has deployment type: sysroot
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn
index a3a8a67..b159b68 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
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 2c23c34..e18f02e 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -856,7 +856,7 @@ Altering morphologies in their source repositories
### Altering clusters ###
- IMPLEMENTS GIVEN a cluster called (\S+) in system branch (\S+)
+ IMPLEMENTS GIVEN a cluster called (\S+) in branch (\S+)
cluster="$MATCH_1"
branch="$MATCH_2"
run_in "$DATADIR/gits/morphs" git checkout "$branch"
diff --git a/yarns/regression.yarn b/yarns/regression.yarn
index 6448aa6..784d6b3 100644
--- a/yarns/regression.yarn
+++ b/yarns/regression.yarn
@@ -34,7 +34,7 @@ source it depended on.
GIVEN a git server
AND system systems/test-system.morph uses core-runtime from core
AND stratum strata/core.morph has match rules: [{artifact: core-runtime, include: [.*-devel]}, {artifact: core-devel, include: [.*-runtime]}]
- 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
diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn
index 4342260..d38eb48 100644
--- a/yarns/splitting.yarn
+++ b/yarns/splitting.yarn
@@ -45,7 +45,7 @@ The best way to test that only using some stratum artifacts works is
to check which files the output has, so we deploy a tarball and inspect
its contents.
- 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