diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-12-07 14:33:58 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-03-24 23:06:07 +0000 |
| commit | 3b65cfe5f6123db169c64023fa9f8dda8a51ff49 (patch) | |
| tree | 2d5bbce5a5a69531c6a45667b8069d086805436c | |
| parent | bfeea6a3945472617f6bfa4179495354ffda1462 (diff) | |
| download | morph-3b65cfe5f6123db169c64023fa9f8dda8a51ff49.tar.gz | |
Prepare tests for using a schema to do validation
Change-Id: I85c9166493199ecbfb3d99950a4c1c580d0a0645
| -rw-r--r-- | yarns/deployment.yarn | 1 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 4 | ||||
| -rw-r--r-- | yarns/regression.yarn | 1 | ||||
| -rw-r--r-- | yarns/splitting.yarn | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn index b159b68c..e6fc885b 100644 --- a/yarns/deployment.yarn +++ b/yarns/deployment.yarn @@ -92,6 +92,7 @@ It is convenient to be able to deploy one system inside another. 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: it-will-be-overriden After the usual setup, we also add a subsystem to the cluster. diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index bd56bee1..4e2030af 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -922,14 +922,14 @@ Implementations for building systems cat << EOF > xyzzy.morph name: xyzzy kind: chunk - build-mode: manual + build-system: manual install-commands: - printvar PREFIX EOF cat << EOF > plugh.morph name: plugh kind: chunk - build-mode: manual + build-system: manual install-commands: - printvar PREFIX - printvar PATH diff --git a/yarns/regression.yarn b/yarns/regression.yarn index 151f60d6..780ecb28 100644 --- a/yarns/regression.yarn +++ b/yarns/regression.yarn @@ -38,6 +38,7 @@ source it depended on. 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: it-will-be-overriden WHEN the user clones definitions AND the user builds the system systems/test-system.morph in branch master GIVEN stratum strata/core.morph in branch master has match rules: [{artifact: core-runtime, include: [.*-runtime]}, {artifact: core-devel, include: [.*-devel]}] diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn index 562c226c..244652d3 100644 --- a/yarns/splitting.yarn +++ b/yarns/splitting.yarn @@ -49,6 +49,7 @@ its contents. 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: it-will-be-overriden WHEN the user clones definitions AND 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 with options test-system.location="$DATADIR/test.tar" |