summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhouloud Touil <ktouil@baylibre.com>2019-10-11 12:49:57 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-10-16 07:51:36 +0000
commit6622cb05d9f5c93b22d94f29122a63a2af84012f (patch)
tree292b06427fceff9e3367e74573148af90cd9e461
parentcbd0ec66adf0842e15f8fc29cfe2ec6a9cee9f47 (diff)
releng-scripts: split can tests to avoid failures
Split the can tests in two, one for basic tests that doesn't need the two can interfaces to be related, and the other one is for a board with two related interfaces. Added a tag for Baylibre board "can_if_hw_connection" to notice the difference. AGL-bug: SPEC-2878 Signed-off-by: Khouloud Touil <ktouil@baylibre.com> Change-Id: I1350098709de05ba50faf719bbb13f9a59f7eac0
-rw-r--r--templates/tests/can_if_hw_connection.jinja29
-rw-r--r--templates/tests/ci.jinja26
-rw-r--r--templates/tests/test_can_loopback.jinja2 (renamed from templates/tests/can.jinja2)5
3 files changed, 16 insertions, 4 deletions
diff --git a/templates/tests/can_if_hw_connection.jinja2 b/templates/tests/can_if_hw_connection.jinja2
new file mode 100644
index 0000000..3611bea
--- /dev/null
+++ b/templates/tests/can_if_hw_connection.jinja2
@@ -0,0 +1,9 @@
+
+- test:
+ timeout:
+ minutes: 10
+ definitions:
+ - repository: https://git.automotivelinux.org/src/qa-testdefinitions
+ from: git
+ path: test-suites/short-smoke/can_if_hw_connection.yaml
+ name: can_if_hw_connection
diff --git a/templates/tests/ci.jinja2 b/templates/tests/ci.jinja2
index 8408057..996fdcb 100644
--- a/templates/tests/ci.jinja2
+++ b/templates/tests/ci.jinja2
@@ -23,7 +23,11 @@
DEVICE_TAGS: "{{ DEVICE_TAGS|join(' ')|lower }}"
{% if "can" in DEVICE_TAGS|lower %}
-{% include 'tests/can.jinja2' %}
+{% 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:
diff --git a/templates/tests/can.jinja2 b/templates/tests/test_can_loopback.jinja2
index 229985f..58eb994 100644
--- a/templates/tests/can.jinja2
+++ b/templates/tests/test_can_loopback.jinja2
@@ -1,9 +1,8 @@
-
- test:
timeout:
minutes: 10
definitions:
- repository: https://git.automotivelinux.org/src/qa-testdefinitions
from: git
- path: test-suites/short-smoke/test_can.yaml
- name: can
+ path: test-suites/short-smoke/test_can_loopback.yaml
+ name: can_loopback \ No newline at end of file