summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2021-03-11 17:30:27 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2021-03-11 17:36:05 +0100
commitc3150a2dbf26b8388d3b370ef256c5e9288d65ae (patch)
tree3d1eaf2c3b289ee85039f13ddfe38c42f4a3fadd
parent8f9b21f2ae6280142bc22a1443fd6b041910c8d1 (diff)
CI builds do use the simpler images here
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I4a7da3a4cc573387ba8af34acd0d2c4292eaa0ec
-rw-r--r--templates/machines/h3ulcb-kf.jinja216
-rw-r--r--templates/machines/r8a7795-agl-refhw.jinja216
2 files changed, 28 insertions, 4 deletions
diff --git a/templates/machines/h3ulcb-kf.jinja2 b/templates/machines/h3ulcb-kf.jinja2
index 7946ed4..9e3202a 100644
--- a/templates/machines/h3ulcb-kf.jinja2
+++ b/templates/machines/h3ulcb-kf.jinja2
@@ -10,10 +10,22 @@
{%- set kernel_image = kernel_image|default("Image") %}
{%- set rootfs_type = rootfs_type|default("nbd") %}
{%- set uboot_type = "booti" %}
+
{%- if branch == 'jellyfish' or branch == 'halibut' %}
-{%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %}
+#{%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %}
+ {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
+ {%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %}
+ {%- else %}
+ {%- set rfs_image = rfs_image|default("agl-image-ivi-h3ulcb.ext4.xz") %}
+ {%- endif %}
{% else %}
-{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %}
+#{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %}
+ {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %}
+ {%- else %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-h3ulcb.ext4.xz") %}
+ {%- endif %}
{% endif %}
+
{%- set initrd = "initramfs-netboot-image-h3ulcb.ext4.gz" %}
{%- set yocto_machine = "h3ulcb" %}
diff --git a/templates/machines/r8a7795-agl-refhw.jinja2 b/templates/machines/r8a7795-agl-refhw.jinja2
index 3dfa463..37ef9be 100644
--- a/templates/machines/r8a7795-agl-refhw.jinja2
+++ b/templates/machines/r8a7795-agl-refhw.jinja2
@@ -8,10 +8,22 @@
{%- set kernel_image = kernel_image|default("Image") %}
{%- set rootfs_type = rootfs_type|default("nbd") %}
{%- set uboot_type = "booti" %}
+
{%- if branch == 'jellyfish' or branch == 'halibut' %}
-{%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %}
+#{%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %}
+ {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
+ {%- set rfs_image = rfs_image|default("agl-image-ivi-crosssdk-h3ulcb.ext4.xz") %}
+ {%- else %}
+ {%- set rfs_image = rfs_image|default("agl-image-ivi-h3ulcb.ext4.xz") %}
+ {%- endif %}
{% else %}
-{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %}
+#{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %}
+ {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %}
+ {%- else %}
+ {%- set rfs_image = rfs_image|default("agl-demo-platform-h3ulcb.ext4.xz") %}
+ {%- endif %}
{% endif %}
+
{%- set initrd = "initramfs-netboot-image-h3ulcb.ext4.gz" %}
{%- set yocto_machine = "h3ulcb" %}