From f3f8ec91d1cf438576a723582fd32f1e57cdc176 Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.welch@collabora.com>
Date: Thu, 1 Jul 2021 14:38:14 +0100
Subject: [PATCH] Remove obsolete tests from v2022dev3

The legacy software framework is being dropped from v2022dev3, as a result
the tests for these services can also be dropped.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
---
 test-cases/canterbury.yaml | 40 ----------------------------
 test-cases/ribchester.yaml | 54 --------------------------------------
 2 files changed, 94 deletions(-)
 delete mode 100644 test-cases/canterbury.yaml
 delete mode 100644 test-cases/ribchester.yaml

diff --git a/test-cases/canterbury.yaml b/test-cases/canterbury.yaml
deleted file mode 100644
index 7b3c3938..00000000
--- a/test-cases/canterbury.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata:
-  name: canterbury
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-    - OSTree
-  type: unit
-  exec-type: automated
-  priority: critical
-  maintainer: "Apertis Project"
-  description: "Test for Canterbury library."
-
-  expected:
-    - "The output is extremely verbose. However, the relevant lines have the
-       following structure:"
-    - |
-        >==== TEST <testname> passed as <username> ====
-        ==== TEST <testname> failed as <username> ====
-
-install:
-  git-repos:
-    - url: https://gitlab.apertis.org/tests/canterbury.git
-      branch: 'apertis/v2022dev3'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd canterbury
-    - "# Execute the following command:"
-    - common/run-test-in-systemd --timeout=900 --user=user --name=canterbury -- ./sadt.sh --verbose
-
-parse:
-  pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'
-  fixupdict:
-    ok: pass
-    FAIL: fail
-    SKIP: skip
diff --git a/test-cases/ribchester.yaml b/test-cases/ribchester.yaml
deleted file mode 100644
index e808c93a..00000000
--- a/test-cases/ribchester.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-metadata:
-  name: ribchester
-  format: "Apertis Test Definition 1.0"
-  image-types:
-    target:  [ armhf, amd64 ]
-    sdk:     [ amd64 ]
-  image-deployment:
-    - APT
-  type: unit
-  exec-type: automated
-  priority: critical
-  maintainer: "Apertis Project"
-  description: "Ribchester library test."
-
-  macro_modules_preconditions: ribchester
-
-  expected:
-    - "All tests should pass (ok). The output should be similar to:"
-    - |
-        >test.name0...ok
-        test.name1...ok
-        test.name2...ok
-        test.nameN...ok
-
-install:
-  deps:
-    - build-essential
-    - devscripts
-    - gnome-desktop-testing
-    - python3-debian
-    - ribchester-dev
-    - ribchester-tests
-  steps:
-    # Download in /tmp directory
-    - cd /tmp/
-    - apt source ribchester
-    - chown user:user -R /tmp/ribchester-*
-  git-repos:
-    - url: https://gitlab.apertis.org/pkg/apertis-tests.git
-      branch: 'apertis/v2022dev3'
-
-run:
-  steps:
-    - "# Enter test directory:"
-    - cd apertis-tests
-    - "# Execute the following command:"
-    - common/run-test-in-systemd --timeout=900 --chdir /tmp/ribchester-* --user=user --name=ribchester -- sadt --verbose
-
-parse:
-  pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'
-  fixupdict:
-    ok: pass
-    FAIL: fail
-    SKIP: skip
-- 
GitLab