summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-10-29 11:21:33 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-11-04 14:24:32 +0000
commit60a52435b8777c094daab6a5c762fa3cf3b1977c (patch)
treebecd696c76314945df1032e2738a070e4ce844f8
parenta8899dd29fac6d4c15d362e796dbcc676f1155a1 (diff)
Prepare CI on master for new framework integration
During the last workshop the transition to the new framework was presented. This change essentially deprecates the SMACK-based application framework. To prepare the integration of it, we remove the deprecated components: - skip application framework related tests on master branch Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I6f8de8b6ddb76b5fc1a229f0ae78ebedc0a7220f
-rw-r--r--templates/base/agl-base.jinja23
-rw-r--r--templates/config/default.cfg8
-rw-r--r--templates/tests/hack-SPEC3655.jinja227
-rw-r--r--templates/tests/pyagl.jinja28
-rw-r--r--templates/tests/release.jinja28
5 files changed, 4 insertions, 50 deletions
diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2
index 8d3e690..346de32 100644
--- a/templates/base/agl-base.jinja2
+++ b/templates/base/agl-base.jinja2
@@ -44,9 +44,6 @@ actions:
{%- if rootfs_type == "nbd" %}
{% include "tests/veth.jinja2" %}
{%- endif %}
-{% if device_type == "r8a7795-h3ulcb-kf" or device_type == "bcm2711-rpi-4-b" or device_type == "r8a7795-agl-refhw" %}
-{% include "tests/hack-SPEC3655.jinja2" %}
-{%- endif %}
{%-for test_template in test_templates %}
{% include test_template %}
{%- endfor %}
diff --git a/templates/config/default.cfg b/templates/config/default.cfg
index e4c0e7e..392cc75 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", "can", "screenshooter", "dumpjournal"]
+test_plan = ["release", "dumpjournal"]
[prerelease]
urlbase = http://download.automotivelinux.org/AGL/upload/ci/
-test_plan = ["release", "pyagl", "can", "screenshooter", "dumpjournal"]
+test_plan = ["release", "dumpjournal"]
[weekly]
[daily]
[snapshot]
urlbase = http://download.automotivelinux.org/AGL/snapshots/
-test_plan = ["release", "pyagl", "can", "dumpjournal"]
+test_plan = ["release", "dumpjournal"]
[ci]
urlbase = http://download.automotivelinux.org/AGL/upload/ci/
-test_plan = ["ci", "pyagl", "can", "screenshooter", "dumpjournal"]
+test_plan = ["ci", "dumpjournal"]
diff --git a/templates/tests/hack-SPEC3655.jinja2 b/templates/tests/hack-SPEC3655.jinja2
deleted file mode 100644
index 0a3b6af..0000000
--- a/templates/tests/hack-SPEC3655.jinja2
+++ /dev/null
@@ -1,27 +0,0 @@
-- test:
- timeout:
- minutes: 5
- definitions:
- - repository:
- metadata:
- format: Lava-Test Test Definition 1.0
- name: HACK-SPEC-3655
- description: "Start geoclue weather services"
- os:
- - oe
- scope:
- - functional
- run:
- steps:
- - afm-util kill agl-service-geoclue
- - sleep 1
- - afm-util start agl-service-geoclue
- - sleep 1
- - afm-util kill agl-service-weather
- - sleep 1
- - afm-util start agl-service-weather
- - sleep 1
- lava-signal: kmsg
- from: inline
- name: HACK-SPEC-3655
- path: inline/hack-spec-3655.yaml
diff --git a/templates/tests/pyagl.jinja2 b/templates/tests/pyagl.jinja2
deleted file mode 100644
index e080ebd..0000000
--- a/templates/tests/pyagl.jinja2
+++ /dev/null
@@ -1,8 +0,0 @@
-- test:
- timeout:
- minutes: 15
- definitions:
- - repository: https://git.automotivelinux.org/src/qa-testdefinitions
- from: git
- path: test-suites/short-smoke/pyagl-nohw-oneshot.yaml
- name: pyagl-tests
diff --git a/templates/tests/release.jinja2 b/templates/tests/release.jinja2
index 0848107..4a509d4 100644
--- a/templates/tests/release.jinja2
+++ b/templates/tests/release.jinja2
@@ -13,14 +13,6 @@
history: False
path: test-suites/short-smoke/smoke-tests-basic.yaml
name: release-smoke-tests-basic
- - repository: https://git.automotivelinux.org/src/qa-testdefinitions
- from: git
- history: False
- path: test-suites/short-smoke/service-check.yaml
- name: release-service-check
- parameters:
- BUILD_TAGS: "{{ BUILD_TAGS }}"
- DEVICE_TAGS: "{{ DEVICE_TAGS }}"
- test:
timeout: