SPEC-3597: move can tests at the end

CAN tests can interfere with pyagl, so move them at the end of the run.

Change-Id: Ied6ef3f08a997ca7f06a7f0756041008a7001245
Bug-AGL: SPEC-3597
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>

3 files changed, 12 insertions, 12 deletions

diff --git a/templates/config/default.cfg b/templates/config/default.cfg
index 5e160fe..0bc2f62 100644
--- a/templates/config/default.cfg
+++ b/templates/config/default.cfg
@@ -4,19 +4,19 @@ style = AGL
 [default]
 [release]
 urlbase = http://download.automotivelinux.org/AGL/release/
-test_plan = ["release", "pyagl"]
+test_plan = ["release", "pyagl", "can"]
 
 [prerelease]
 urlbase = http://download.automotivelinux.org/AGL/upload/ci/
-test_plan = ["release", "pyagl"]
+test_plan = ["release", "pyagl", "can"]
 
 [weekly]
 [daily]
 [snapshot]
 urlbase = http://download.automotivelinux.org/AGL/snapshots/
-test_plan = ["release", "pyagl"]
+test_plan = ["release", "pyagl", "can"]
 
 [ci]
 urlbase = http://download.automotivelinux.org/AGL/upload/ci/
-test_plan = ["ci", "pyagl"]
+test_plan = ["ci", "pyagl", "can"]
 
diff --git a/templates/tests/can.jinja2 b/templates/tests/can.jinja2
new file mode 100644
index 0000000..3d671f8
--- /dev/null
+++ b/templates/tests/can.jinja2
@@ -0,0 +1,8 @@
+{% if "can" in DEVICE_TAGS|lower %}
+{% include 'tests/test_can_loopback.jinja2' %}
+{% endif %}
+
+{% if "can_if_hw_connection" in DEVICE_TAGS|lower %}
+{% include 'tests/can_if_hw_connection.jinja2' %}
+{% endif %}
+
diff --git a/templates/tests/ci.jinja2 b/templates/tests/ci.jinja2
index ad75f2f..f4cb8d9 100644
--- a/templates/tests/ci.jinja2
+++ b/templates/tests/ci.jinja2
@@ -22,14 +22,6 @@
         BUILD_TAGS: "{{ BUILD_TAGS|join(' ')|lower }}"
         DEVICE_TAGS: "{{ DEVICE_TAGS|join(' ')|lower }}"
 
-{% if "can" in DEVICE_TAGS|lower %}
-{% include 'tests/test_can_loopback.jinja2' %}
-{% endif %}
-
-{% if "can_if_hw_connection" in DEVICE_TAGS|lower %}
-{% include 'tests/can_if_hw_connection.jinja2' %}
-{% endif %}
-
 - test:
     timeout:
       minutes: 60