Currently the build commands treat the system argument as a path relative to the root repo. This means that regardless of your working directory you must run morph build systems/foo-system.morph This behaviour can be confusing, for example when your working directory is $systembranch/definitions/systems you might expect to be able to run morph build foo-system.morph especially since most shells would tab-complete the filename for you. At the moment running the above command from $systembranch/definitions/systems would result in an error, because morph would look for $systembranch/definitions/foo-system.morph rather than $systembranch/definitions/systems/foo-system.morph This behaviour also means you can't give the morph build commands an absolute path to a system morph. This patch changes the treatment of the system arg so that it is interpreted relative to the current working directory. --- morphlib/plugins/build_plugin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py index 218bd81..31cba4f 100644 --- a/morphlib/plugins/build_plugin.py +++ b/morphlib/plugins/build_plugin.py @@ -17,6 +17,7 @@ import cliapp import contextlib import uuid +import logging import morphlib @@ -158,11 +159,14 @@ class BuildPlugin(cliapp.Plugin): self.app.settings['cachedir'], self.app.settings['cachedir-min-space']) - system_filename = morphlib.util.sanitise_morphology_path(args[0]) - ws = morphlib.workspace.open('.') sb = morphlib.sysbranchdir.open_from_within('.') + system_filename = morphlib.util.sanitise_morphology_path(args[0]) + system_filename = sb.relative_to_root_repo(system_filename) + + logging.debug('System branch is %s' % sb.root_directory) + build_uuid = uuid.uuid4().hex if self.use_distbuild: -- 1.7.10.4

--- yarns/building.yarn | 27 +++++++++++++++++++++++++++ yarns/implementations.yarn | 8 ++++++++ 2 files changed, 35 insertions(+) diff --git a/yarns/building.yarn b/yarns/building.yarn index 253b3b3..7e9406a 100644 --- a/yarns/building.yarn +++ b/yarns/building.yarn @@ -9,6 +9,33 @@ Morph Building Tests THEN morph build the system systems/base-system.morph of the branch master FINALLY the git server is shut down + SCENARIO build system with relative path + GIVEN a workspace + AND a git server + WHEN the user checks out the system branch called master + AND the user creates an uncommitted system morphology called systems/base-system.morph for our architecture in system branch master + AND from the directory workspace/master/test/morphs/systems the user attempts to morph build the system base-system.morph + THEN morph succeeded + FINALLY the git server is shut down + + SCENARIO build system with relative path (second variant) + GIVEN a workspace + AND a git server + WHEN the user checks out the system branch called master + AND the user creates an uncommitted system morphology called systems/base-system.morph for our architecture in system branch master + AND from the directory workspace/master/test/morphs/systems the user attempts to morph build the system ../systems/base-system.morph + THEN morph succeeded + FINALLY the git server is shut down + + SCENARIO build system with absolute path + GIVEN a workspace + AND a git server + WHEN the user checks out the system branch called master + AND the user creates an uncommitted system morphology called systems/base-system.morph for our architecture in system branch master + AND from the directory workspace/master/test/morphs/systems the user attempts to morph build the system using the absolute path to base-system.morph + THEN morph succeeded + FINALLY the git server is shut down + System integrations ------------------- diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 2c2c6d1..f73e3c6 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -899,6 +899,14 @@ Implementations for building systems cd "$DATADIR/workspace/$MATCH_2/test/morphs" run_morph build "$MATCH_1" + IMPLEMENTS WHEN from the directory (\S+) the user attempts to morph build the system (\S+) + cd "$DATADIR/$MATCH_1" + attempt_morph build "$MATCH_2" + + IMPLEMENTS WHEN from the directory (\S+) the user attempts to morph build the system using the absolute path to (\S+) + cd "$DATADIR/$MATCH_1" + attempt_morph build "$(pwd)/$MATCH_2" + Implementations for tarball inspection -------------------------------------- -- 1.7.10.4

--- yarns/deployment.yarn | 27 +++++++++++++++++++++++++++ yarns/implementations.yarn | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn index 0782c7c..31406cc 100644 --- a/yarns/deployment.yarn +++ b/yarns/deployment.yarn @@ -24,6 +24,33 @@ Morph Deployment Tests THEN morph succeeded FINALLY the git server is shut down + SCENARIO deploying a cluster using a relative path + GIVEN a workspace + AND a git server + WHEN the user checks out the system branch called master + AND the user builds the system systems/test-system.morph in branch master + AND from directory workspace/master/test/morphs/clusters the user attempts to deploy the cluster test-cluster.morph in branch master + THEN morph succeeded + FINALLY the git server is shut down + + SCENARIO deploying a cluster using a relative path (second variant) + GIVEN a workspace + AND a git server + WHEN the user checks out the system branch called master + AND the user builds the system systems/test-system.morph in branch master + AND from directory workspace/master/test/morphs/clusters the user attempts to deploy the cluster ../clusters/test-cluster.morph in branch master + THEN morph succeeded + FINALLY the git server is shut down + + SCENARIO deploying a cluster using an absolute path + GIVEN a workspace + AND a git server + WHEN the user checks out the system branch called master + AND the user builds the system systems/test-system.morph in branch master + AND from directory workspace/master/test/morphs/clusters the user attempts to deploy the cluster using the absolute path to test-cluster.morph in branch master + THEN morph succeeded + FINALLY the git server is shut down + Some deployment types support upgrades, but some do not and Morph needs to make this clear. diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index f73e3c6..83ff03c 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -247,6 +247,19 @@ another to hold a chunk. morph: strata/core.morph EOF + mkdir "$DATADIR/gits/morphs/clusters" + cd "$DATADIR/gits/morphs" + install -m644 -D /dev/stdin << EOF "clusters/test-cluster.morph" + name: test-cluster + kind: cluster + systems: + - morph: systems/test-system.morph + deploy: + test-system: + type: tar + location: test.tar + EOF + install -m644 -D /dev/stdin << EOF "strata/build-essential.morph" name: build-essential kind: stratum @@ -723,14 +736,26 @@ Defaults are set in the cluster morphology, so we can deploy without setting any extra parameters, but we also need to be able to override them, so they can be added to the end of the implements section. - IMPLEMENTS WHEN the user (attempts to deploy|deploys) the (system|cluster) (\S+) in branch (\S+)( with options (.*))? - cd "$DATADIR/workspace/$MATCH_4" - set -- deploy "$MATCH_3" - if [ "$MATCH_5" != '' ]; then + IMPLEMENTS WHEN (from directory (\S+) )?the user (attempts to deploy|deploys) the (system|cluster) (using the absolute path to )?(\S+) in branch (\S+)( with options (.*))? + if [ "$MATCH_1" != "" ] + then + cd "$DATADIR/$MATCH_2" + else + cd "$DATADIR/workspace/$MATCH_7/test/morphs" + fi + + if [ "$MATCH_5" != "" ] + then + set -- deploy "$(pwd)/$MATCH_6" + else + set -- deploy "$MATCH_6" + fi + + if [ "$MATCH_8" != '' ]; then # eval used so word splitting in the text is preserved - eval set -- '"$@"' $MATCH_6 + eval set -- '"$@"' $MATCH_9 fi - if [ $MATCH_1 == "deploys" ]; then run_morph "$@" + if [ $MATCH_3 == "deploys" ]; then run_morph "$@" else attempt_morph "$@"; fi IMPLEMENTS WHEN the user (attempts to deploy|deploys) (.*) from cluster (\S+) in branch (\S+) -- 1.7.10.4

Simplify 'deploying a cluster morphology as a tarfile' and 'attempting to upgrade a tarfile deployment' --- yarns/deployment.yarn | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn index 31406cc..47aeff5 100644 --- a/yarns/deployment.yarn +++ b/yarns/deployment.yarn @@ -14,13 +14,8 @@ Morph Deployment Tests GIVEN a workspace AND a git server WHEN the user checks out the system branch called master - GIVEN a cluster called test-cluster.morph in system 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 - AND system test-system in cluster test-cluster.morph in branch master has deployment location: test.tar - WHEN the user builds the system systems/test-system.morph in branch master - AND the user attempts to deploy the cluster test-cluster.morph in branch master + AND the user builds the system systems/test-system.morph in branch master + AND the user attempts to deploy the cluster clusters/test-cluster.morph in branch master THEN morph succeeded FINALLY the git server is shut down @@ -58,13 +53,8 @@ this clear. GIVEN a workspace AND a git server WHEN the user checks out the system branch called master - GIVEN a cluster called test-cluster.morph in system 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 - AND system test-system in cluster test-cluster.morph in branch master has deployment location: test.tar - WHEN the user builds the system systems/test-system.morph in branch master - AND the user attempts to upgrade the cluster test-cluster.morph in branch master + AND the user builds the system systems/test-system.morph in branch master + AND the user attempts to upgrade the cluster clusters/test-cluster.morph in branch master THEN morph failed FINALLY the git server is shut down -- 1.7.10.4