diff options
| author |   Loys Ollivier <lollivier@baylibre.com> | 2018-01-03 16:11:49 +0100 |
|---|---|---|
| committer | Loys Ollivier <lollivier@baylibre.com> | 2018-01-10 15:31:32 +0100 |
| commit | 7df990a4080d77ebce1d9d867b207627e7059e85 (patch) | |
| tree | 69133334c34b80c66d58d3661d4b175776f9f155 | |
| parent | 927d952dae1faa84a747ccd5b9885ed21ccc69bd (diff) | |
templates: fix the rootfs name for m3ulcb and rpi3 daily builds
The rootfs filename has changed for the daily builds. Change the default
to the new filename for both platforms.
Change-Id: I44ae29902d882ab6f38dc14bba11cc8aee88f8c2
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
| -rw-r--r-- | templates/base/agl-base-defaults.jinja2 | 1 | ||||
| -rw-r--r-- | templates/machines/m3ulcb.jinja2 | 3 | ||||
| -rw-r--r-- | templates/machines/raspberrypi3.jinja2 | 6 | ||||
| -rw-r--r-- | utils/agljobtemplate.py | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index d432b63..3f13f08 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -3,6 +3,7 @@ {%- endmacro %} {%- set action_timeout = action_timeout|default(15) %} {%- set boot_timeout = boot_timeout|default(10) %} +{%- set build_type = build_type|default("default") %} {%- set connection_timeout = connection_timeout|default(5) %} {%- set deploy_timeout = deploy_timeout|default(15) %} {%- set device_type = device_type|default(yocto_machine+"-uboot") %} 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 %} diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index a392845..dec7fad 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -98,6 +98,7 @@ class Agljobtemplate(object): job['name'] = job_name job['yocto_machine'] = machine job['priority'] = priority + job['build_type'] = build_type defaults, infra = parse_cfg_file(self._template_path, 'default.cfg', build_type) |