From 7df990a4080d77ebce1d9d867b207627e7059e85 Mon Sep 17 00:00:00 2001
From: Loys Ollivier <lollivier@baylibre.com>
Date: Wed, 3 Jan 2018 16:11:49 +0100
Subject: 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>
---
templates/base/agl-base-defaults.jinja2 | 1 +
templates/machines/m3ulcb.jinja2 | 3 +++
templates/machines/raspberrypi3.jinja2 | 6 +++++-
utils/agljobtemplate.py | 1 +
4 files changed, 10 insertions(+), 1 deletion(-)
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)
--
cgit