diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2014-09-01 10:27:14 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2014-09-01 10:27:14 +0000 |
| commit | 6517fd82be115388dda0532aedd6a835345635e6 (patch) | |
| tree | c57313e6eca50816db6c1649dd4c4ff22d0d5465 /yarns | |
| parent | 9c0011417081326ebb72d9ed02fcbbc456946dc4 (diff) | |
| parent | 354253df295bb2815a9d5e0744b3aa98eea6aad9 (diff) | |
| download | morph-6517fd82be115388dda0532aedd6a835345635e6.tar.gz | |
Merge branch 'deploy-improvements'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/deployment.yarn | 2 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn index 4039d551..40b50432 100644 --- a/yarns/deployment.yarn +++ b/yarns/deployment.yarn @@ -7,7 +7,7 @@ Morph Deployment Tests WHEN the user checks out the system branch called master AND the user attempts to deploy the system systems/test-system.morph in branch master THEN morph failed - AND the deploy error message includes the string "morph deploy is only supported for cluster morphologies" + AND the deploy error message includes the string "morph deployment commands are only supported for cluster morphologies" FINALLY the git server is shut down SCENARIO deploying a cluster morphology as a tarfile diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 422c2eea..52eee01d 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -692,7 +692,7 @@ them, so they can be added to the end of the implements section. IMPLEMENTS WHEN the user (attempts to upgrade|upgrades) the (system|cluster) (\S+) in branch (\S+)( with options (.*))? cd "$DATADIR/workspace/$MATCH_4" - set -- deploy --upgrade "$MATCH_3" + set -- upgrade "$MATCH_3" if [ "$MATCH_5" != '' ]; then # eval used so word splitting in the text is preserved eval set -- '"$@"' $MATCH_6 |