summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-12-11 17:58:20 (GMT)
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-12-11 17:58:20 (GMT)
commit74a00fe38c7fa974b824675da0dde447f484f5a4 (patch)
tree0f5113e2a1a7bfd23408f8c057b2095f6ecd7bcc
parent857572288216387c2288f50531ed927b06207943 (diff)
downloaddefinitions-baserock/adamcoldrick/zuul-ci.tar.gz
Add the system-tests repo into the Mason systembaserock/adamcoldrick/zuul-ci
-rw-r--r--strata/zuul-ci.morph5
-rw-r--r--strata/zuul-ci/system-tests.morph5
-rw-r--r--systems/mason-system-x86_64-generic.morph1
3 files changed, 11 insertions, 0 deletions
diff --git a/strata/zuul-ci.morph b/strata/zuul-ci.morph
index 82e6abd..95cb9e4 100644
--- a/strata/zuul-ci.morph
+++ b/strata/zuul-ci.morph
@@ -124,3 +124,8 @@ chunks:
- python-daemon
- extras
- gitpython
+- name: system-tests
+ morph: strata/zuul-ci/system-tests.morph
+ repo: baserock:baserock/system-tests
+ ref: baserock/adamcoldrick/mason-tests
+ build-depends: []
diff --git a/strata/zuul-ci/system-tests.morph b/strata/zuul-ci/system-tests.morph
new file mode 100644
index 0000000..2f356e1
--- /dev/null
+++ b/strata/zuul-ci/system-tests.morph
@@ -0,0 +1,5 @@
+name: system-tests
+kind: chunk
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/share/system-tests
+- cp -a mason "$DESTDIR$PREFIX"/share/system-tests/mason
diff --git a/systems/mason-system-x86_64-generic.morph b/systems/mason-system-x86_64-generic.morph
index d55c945..1bbbb6d 100644
--- a/systems/mason-system-x86_64-generic.morph
+++ b/systems/mason-system-x86_64-generic.morph
@@ -44,4 +44,5 @@ configuration-extensions:
- install-files
- distbuild
- fstab
+- mason
- cloud-init