diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-01-16 12:00:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-01-16 12:00:47 +0000 |
| commit | 7b89850f324f10270e32c7a2aa1addbfadf9c029 (patch) | |
| tree | cffd3b43552f5f95e17c759c89d8c12e7db2b71c /templates/machines | |
| parent | 4bae0df78fae4270038eb44fa2720dfd28675d6a (diff) | |
| parent | 7df990a4080d77ebce1d9d867b207627e7059e85 (diff) | |
Merge changes I44ae2990,Ied4e9f80,I9ce801a7
* changes:
templates: fix the rootfs name for m3ulcb and rpi3 daily builds
utils: define test-plans based on build-type
utils: change the url / build behavior scheme
Diffstat (limited to 'templates/machines')
| -rw-r--r-- | templates/machines/m3ulcb.jinja2 | 3 | ||||
| -rw-r--r-- | templates/machines/raspberrypi3.jinja2 | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2 index 41b6677..f337a8d 100644 --- a/templates/machines/m3ulcb.jinja2 +++ b/templates/machines/m3ulcb.jinja2 @@ -6,3 +6,6 @@ {%- set kernel_image = kernel_image|default("Image") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} +{%- if build_type == 'daily' %} + {%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-m3ulcb.ext4.xz") %} +{%- endif %} diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2 index e415c2c..0e743a8 100644 --- a/templates/machines/raspberrypi3.jinja2 +++ b/templates/machines/raspberrypi3.jinja2 @@ -9,4 +9,8 @@ {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} {%- endif %} {%- set dtb = dtb|default("uImage-bcm2710-rpi-3-b.dtb") %} -{%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi3.ext4.xz") %} +{%- if build_type == 'daily' %} + {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-raspberrypi3.ext4.xz") %} +{%- else %} + {%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi3.ext4.xz") %} +{%- endif %} |