diff options
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/implementations.yarn | 34 | ||||
| -rw-r--r-- | yarns/regression.yarn | 6 |
2 files changed, 35 insertions, 5 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index ff1971f8..9f23107b 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -250,7 +250,37 @@ another to hold a chunk. mkdir "$DATADIR/gits/morphs" cd "$DATADIR/gits/morphs" git init . - echo 'version: 6' > VERSION + echo 'version: 7' > VERSION + + install -m644 -D /dev/stdin << EOF "DEFAULTS" + # This is a simplified version of the DEFAULTS file supplied with the + # Baserock reference system definitions. + build-systems: + autotools: + configure-commands: + - ./configure + build-commands: + - make + install-commands: + - make install + split-rules: + chunk: + - artifact: -devel + include: + - (usr/)?include/.* + - (usr/)?lib/.*\.a + - (usr/)?share/man/.* + - artifact: -runtime + include: + - .* + stratum: + - artifact: -devel + include: + - .*-devel + - artifact: -runtime + include: + - .*-runtime + EOF arch=$(run_morph print-architecture) install -m644 -D /dev/stdin << EOF "systems/test-system.morph" @@ -333,7 +363,7 @@ another to hold a chunk. install-commands: - copy files system-integration: - test-chunk-bins: + test-chunk-runtime: 00-passwd: - | create file /etc/passwd diff --git a/yarns/regression.yarn b/yarns/regression.yarn index c424f437..aa98eec5 100644 --- a/yarns/regression.yarn +++ b/yarns/regression.yarn @@ -59,17 +59,17 @@ source it depended on. GIVEN a workspace AND 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: [.*-(bins|libs|locale)]}, {artifact: core-devel, include: [.*-(devel|doc|misc)]}] + AND stratum strata/core.morph has match rules: [{artifact: core-runtime, include: [.*-devel]}, {artifact: core-devel, include: [.*-runtime]}] 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 WHEN the user builds the system systems/test-system.morph in branch master - GIVEN stratum strata/core.morph in system branch master has match rules: [{artifact: core-runtime, include: [.*-(bins|libs|misc)]}, {artifact: core-devel, include: [.*-(devel|doc|locale)]}] + GIVEN stratum strata/core.morph in system branch master has match rules: [{artifact: core-runtime, include: [.*-runtime]}, {artifact: core-devel, include: [.*-devel]}] WHEN the user builds the system systems/test-system.morph in branch master AND the user deploys the cluster test-cluster.morph in branch master with options test-system.location="$DATADIR/test.tar" - THEN tarball test.tar contains baserock/test-chunk-misc.meta + THEN tarball test.tar contains baserock/test-chunk-runtime.meta FINALLY the git server is shut down |