aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2019-05-23 13:12:14 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2019-05-23 13:17:26 +0200
commit1bff41e945dccf2a7e52f7c776fbee5c6e4085b9 (patch)
tree5297594fc60e357ccae4e7e05b6cdc3b791bac89
parent32b88dfd726ba9e85999d465c15af56ebeea5888 (diff)
Fix rootfs for upsquare on CI build
See the qemu case. Bug-AGL: SPEC-2449 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Ib23bd4897e89d3eca1eaba33a37c256c932e2d36
-rw-r--r--templates/machines/upsquare.jinja26
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/machines/upsquare.jinja2 b/templates/machines/upsquare.jinja2
index 5086ada..36da2a2 100644
--- a/templates/machines/upsquare.jinja2
+++ b/templates/machines/upsquare.jinja2
@@ -6,4 +6,8 @@
{%- set yocto_machine = "intel-corei7-64" %}
{%- set kernel_image = kernel_image|default("bzImage") %}
{%- set rootfs_type = rootfs_type|default("nbd") %}
-{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-intel-corei7-64.ext4.xz") %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-intel-corei7-64.ext4.xz") %}
+{%- else %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-intel-corei7-64.ext4.xz") %}
+{%- endif %} \ No newline at end of file