summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-11-28 11:23:50 (GMT)
committerJavier Jardón <jjardon@gnome.org>2014-11-28 11:24:00 (GMT)
commit778f4b6a95dc3510d9d2d70866d5142691da1a78 (patch)
tree6875adf74fc5f0f55b366cc88577ea6b7cb5a240
parentb8b9e1fdff9beea1f6c7ef05b6e074b880cd97f9 (diff)
parentd7cf42e8e2f0890756a1a5c3d60bbbca3aabcb3e (diff)
downloaddefinitions-778f4b6a95dc3510d9d2d70866d5142691da1a78.tar.gz
Merge branch 'baserock/jjardon/ci'
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk> Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
-rw-r--r--clusters/ci.morph18
1 files changed, 18 insertions, 0 deletions
diff --git a/clusters/ci.morph b/clusters/ci.morph
index 734f39f..48e978b 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -29,3 +29,21 @@ systems:
BOOTLOADER_CONFIG_FORMAT: "extlinux"
BOOTLOADER_INSTALL: "none"
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+- morph: systems/weston-system-x86_64-generic.morph
+ deploy:
+ weston-system-x86_64-generic:
+ type: rawdisk
+ location: weston-system-x86_64-generic.img
+ DISK_SIZE: 4G
+ KERNEL_ARGS: vga=788
+- morph: systems/weston-system-armv7lhf-jetson.morph
+ deploy:
+ weston-system-armv7lhf-jetson:
+ type: rawdisk
+ location: weston-system-armv7lhf-jetson.img
+ DISK_SIZE: 4G
+ ROOT_DEVICE: "/dev/mmcblk0p1"
+ DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
+ BOOTLOADER_CONFIG_FORMAT: "extlinux"
+ BOOTLOADER_INSTALL: "none"
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1