diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-13 09:51:51 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-13 09:51:51 +0000 |
| commit | a1d5011d51f83f6c13916e34a24565435217b885 (patch) | |
| tree | 29ddff21d533eaa02b0f10f668981435601801de /clusters/ci.morph | |
| parent | 5a10111c049228302e37d495c1a32588a7cc41f6 (diff) | |
| parent | 0e0a329c086d424452eaa0bfa77e573f77e3b930 (diff) | |
| download | infrastructure-a1d5011d51f83f6c13916e34a24565435217b885.tar.gz | |
Merge remote-tracking branch 'definitions/master'pedro/openssl101t
Change-Id: I3c7b31d2006dafd8b69386cbee41d0d568b348eb
Diffstat (limited to 'clusters/ci.morph')
| -rw-r--r-- | clusters/ci.morph | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph index 95d6d0f7..a162eff0 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -6,6 +6,13 @@ description: | This cluster morph is for use by the Mason Continuous Delivery pipeline during development. systems: +- morph: systems/minimal-system-x86_64-generic.morph + deploy: + minimal-system-x86_64-generic: + type: extensions/rawdisk + location: minimal-system-x86_64-generic.img + DISK_SIZE: 512M + INIT_SYSTEM: busybox - morph: systems/devel-system-x86_64-generic.morph deploy: devel-system-x86_64-generic: @@ -84,6 +91,13 @@ systems: GENIVI_WESTON_BACKEND: drm GENIVI_WESTON_CONFIG: baseline GENIVI_WESTON_AUTOSTART: True +- morph: systems/weston-qt5-system-x86_64.morph + deploy: + weston-qt5-system-x86_64.morph: + type: extensions/rawdisk + location: weston-qt5-system-x86_64.morph.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 - morph: systems/openstack-system-x86_64.morph deploy: openstack-system-x86_64: |