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

4 files changed, 13 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/URLs/default.cfg b/templates/config/default.cfg
index 4c2adec..ba43270 100644
--- a/templates/URLs/default.cfg
+++ b/templates/config/default.cfg
@@ -2,10 +2,14 @@
 style = AGL
 [default]
 urlbase = https://download.automotivelinux.org/AGL/release/dab/4.0.2/
+test_plan = ["health-test","smoke"]
 [release]
 urlbase = https://download.automotivelinux.org/AGL/release/
+test_plan = ["all"]
 [weekly]
 [daily]
 urlbase = https://download.automotivelinux.org/AGL/snapshots/
+test_plan = ["health-test","smoke", "yocto-ptest"]
 [ci]
 urlbase = https://download.automotivelinux.org/AGL/upload/ci/
+test_plan = ["health-test","smoke"]
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 %}