From 2777863baba80ffb59156f080deeffe0423b90c3 Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Fri, 14 Dec 2018 22:27:24 +0800
Subject: [PATCH] Update test cases for lava integration (folks/modules)
This commit applies the required changes to the test cases so
they can be executed in LAVA.
The change consists in adding the `git-repos` directive so they
can fetch the tests scripts from LAVA.
This commit includes the folks and modules groups.
Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
---
...abstract-contact-addressbook-creation.yaml | 9 +++++--
test-cases/folks-alias-persistence.yaml | 19 ++++++++------
test-cases/folks-eds-compatibility.yaml | 19 ++++++++------
.../folks-metacontacts-antilinking.yaml | 17 ++++++++-----
test-cases/folks-metacontacts-linking.yaml | 19 ++++++++------
test-cases/folks-metacontacts-unlinking.yaml | 19 ++++++++------
test-cases/folks-search-contacts.yaml | 19 ++++++++------
test-cases/frome.yaml | 25 +++++++++++--------
test-cases/newport.yaml | 9 +++++--
test-cases/ribchester.yaml | 25 +++++++++++--------
test-cases/traprain.yaml | 25 +++++++++++--------
11 files changed, 130 insertions(+), 75 deletions(-)
diff --git a/test-cases/abstract-contact-addressbook-creation.yaml b/test-cases/abstract-contact-addressbook-creation.yaml
index 90a3968..2e39cb8 100644
--- a/test-cases/abstract-contact-addressbook-creation.yaml
+++ b/test-cases/abstract-contact-addressbook-creation.yaml
@@ -19,11 +19,16 @@ metadata:
install:
deps:
- - syncevolution
- - uuid-runtime
+ - syncevolution
+ - uuid-runtime
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "common/run-test-in-systemd --user=user --timeout=900 folks/create-abstract-sync-database.sh"
parse:
diff --git a/test-cases/folks-alias-persistence.yaml b/test-cases/folks-alias-persistence.yaml
index 35fcd32..288a268 100644
--- a/test-cases/folks-alias-persistence.yaml
+++ b/test-cases/folks-alias-persistence.yaml
@@ -14,16 +14,21 @@ metadata:
install:
deps:
- - telepathy-ring
- - telepathy-mission-control-5
- - telepathy-gabble
- - libfolks-eds25
- - libfolks-telepathy25
- - folks-tools
- - syncevolution
+ - telepathy-ring
+ - telepathy-mission-control-5
+ - telepathy-gabble
+ - libfolks-eds25
+ - libfolks-telepathy25
+ - folks-tools
+ - syncevolution
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- "common/run-test-in-systemd --user=user --timeout=900 folks/folks-alias-persistence.sh"
diff --git a/test-cases/folks-eds-compatibility.yaml b/test-cases/folks-eds-compatibility.yaml
index 38cb2ec..998bc45 100644
--- a/test-cases/folks-eds-compatibility.yaml
+++ b/test-cases/folks-eds-compatibility.yaml
@@ -16,16 +16,21 @@ metadata:
install:
deps:
- - telepathy-ring
- - telepathy-mission-control-5
- - telepathy-gabble
- - libfolks-eds25
- - libfolks-telepathy25
- - folks-tools
- - syncevolution
+ - telepathy-ring
+ - telepathy-mission-control-5
+ - telepathy-gabble
+ - libfolks-eds25
+ - libfolks-telepathy25
+ - folks-tools
+ - syncevolution
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- "common/run-test-in-systemd --user=user --timeout=900 folks/folks-eds-compatibility.sh"
diff --git a/test-cases/folks-metacontacts-antilinking.yaml b/test-cases/folks-metacontacts-antilinking.yaml
index 989d001..9146adc 100644
--- a/test-cases/folks-metacontacts-antilinking.yaml
+++ b/test-cases/folks-metacontacts-antilinking.yaml
@@ -14,15 +14,20 @@ metadata:
install:
deps:
- - telepathy-ring
- - telepathy-mission-control-5
- - telepathy-gabble
- - libfolks-eds25
- - libfolks-telepathy25
- - folks-tools
+ - telepathy-ring
+ - telepathy-mission-control-5
+ - telepathy-gabble
+ - libfolks-eds25
+ - libfolks-telepathy25
+ - folks-tools
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- "common/run-test-in-systemd --user=user --timeout=900 folks/folks-metacontacts-antilinking.sh"
diff --git a/test-cases/folks-metacontacts-linking.yaml b/test-cases/folks-metacontacts-linking.yaml
index 0bb5e68..98677d5 100644
--- a/test-cases/folks-metacontacts-linking.yaml
+++ b/test-cases/folks-metacontacts-linking.yaml
@@ -14,16 +14,21 @@ metadata:
install:
deps:
- - telepathy-ring
- - telepathy-mission-control-5
- - telepathy-gabble
- - libfolks-eds25
- - libfolks-telepathy25
- - folks-tools
- - syncevolution
+ - telepathy-ring
+ - telepathy-mission-control-5
+ - telepathy-gabble
+ - libfolks-eds25
+ - libfolks-telepathy25
+ - folks-tools
+ - syncevolution
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- "common/run-test-in-systemd --user=user --timeout=900 folks/folks-metacontacts-linking.sh"
diff --git a/test-cases/folks-metacontacts-unlinking.yaml b/test-cases/folks-metacontacts-unlinking.yaml
index 43f8e3a..f44467b 100644
--- a/test-cases/folks-metacontacts-unlinking.yaml
+++ b/test-cases/folks-metacontacts-unlinking.yaml
@@ -14,16 +14,21 @@ metadata:
install:
deps:
- - telepathy-ring
- - telepathy-mission-control-5
- - telepathy-gabble
- - libfolks-eds25
- - libfolks-telepathy25
- - folks-tools
- - syncevolution
+ - telepathy-ring
+ - telepathy-mission-control-5
+ - telepathy-gabble
+ - libfolks-eds25
+ - libfolks-telepathy25
+ - folks-tools
+ - syncevolution
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- "common/run-test-in-systemd --user=user --timeout=900 folks/folks-metacontacts-unlinking.sh"
diff --git a/test-cases/folks-search-contacts.yaml b/test-cases/folks-search-contacts.yaml
index 1b64e59..fe4c576 100644
--- a/test-cases/folks-search-contacts.yaml
+++ b/test-cases/folks-search-contacts.yaml
@@ -14,16 +14,21 @@ metadata:
install:
deps:
- - telepathy-ring
- - telepathy-mission-control-5
- - telepathy-gabble
- - libfolks-eds25
- - libfolks-telepathy25
- - folks-tools
- - syncevolution
+ - telepathy-ring
+ - telepathy-mission-control-5
+ - telepathy-gabble
+ - libfolks-eds25
+ - libfolks-telepathy25
+ - folks-tools
+ - syncevolution
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- common/run-test-in-systemd --user=user --timeout=900 folks/folks-search-contacts.sh
diff --git a/test-cases/frome.yaml b/test-cases/frome.yaml
index 809f66e..497b8c8 100644
--- a/test-cases/frome.yaml
+++ b/test-cases/frome.yaml
@@ -21,20 +21,25 @@ metadata:
install:
deps:
- - devscripts
- - frome-tests
- - gnome-desktop-testing
- - python3-debian
+ - devscripts
+ - frome-tests
+ - gnome-desktop-testing
+ - python3-debian
steps:
- # Download in /tmp directory
- - cd /tmp/
- - apt source frome
- - chown user:user -R /tmp/frome-*
+ # Download in /tmp directory
+ - cd /tmp/
+ - apt source frome
+ - chown user:user -R /tmp/frome-*
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
- - "# Execute the following commands:"
- - common/run-test-in-systemd --timeout=900 --chdir /tmp/frome-* --user=user --name=frome -- sadt --verbose
+ - "# Enter test directory:"
+ - cd apertis-tests
+ - "# Execute the following commands:"
+ - common/run-test-in-systemd --timeout=900 --chdir /tmp/frome-* --user=user --name=frome -- sadt --verbose
parse:
pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'
diff --git a/test-cases/newport.yaml b/test-cases/newport.yaml
index 348be88..d63813c 100644
--- a/test-cases/newport.yaml
+++ b/test-cases/newport.yaml
@@ -14,11 +14,16 @@ metadata:
install:
deps:
- - gnome-desktop-testing
- - newport-tests
+ - gnome-desktop-testing
+ - newport-tests
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
+ - "# Enter test directory:"
+ - cd apertis-tests
- "# Execute the following command:"
- common/run-test-in-systemd --user=user --timeout=900 --name=newport gnome-desktop-testing-runner newport
diff --git a/test-cases/ribchester.yaml b/test-cases/ribchester.yaml
index 63a05e0..c93293c 100644
--- a/test-cases/ribchester.yaml
+++ b/test-cases/ribchester.yaml
@@ -21,20 +21,25 @@ metadata:
install:
deps:
- - build-essential
- - devscripts
- - gnome-desktop-testing
- - python3-debian
- - ribchester-dev
- - ribchester-tests
+ - 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-*
+ # Download in /tmp directory
+ - cd /tmp/
+ - apt source ribchester
+ - chown user:user -R /tmp/ribchester-*
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
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
diff --git a/test-cases/traprain.yaml b/test-cases/traprain.yaml
index 35cc1a8..261d2f0 100644
--- a/test-cases/traprain.yaml
+++ b/test-cases/traprain.yaml
@@ -21,20 +21,25 @@ metadata:
install:
deps:
- - devscripts
- - gnome-desktop-testing
- - libtraprain-0-tests
- - python3-debian
+ - devscripts
+ - gnome-desktop-testing
+ - libtraprain-0-tests
+ - python3-debian
steps:
- # Download in /tmp directory
- - cd /tmp/
- - apt source traprain
- - chown user:user -R /tmp/traprain-*
+ # Download in /tmp directory
+ - cd /tmp/
+ - apt source traprain
+ - chown user:user -R /tmp/traprain-*
+ git-repos:
+ - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+ branch: master
run:
steps:
- - "# Execute the following commands:"
- - common/run-test-in-systemd --timeout=900 --chdir /tmp/traprain-* --user=user --name=traprain -- sadt --verbose
+ - "# Enter test directory:"
+ - cd apertis-tests
+ - "# Execute the following commands:"
+ - common/run-test-in-systemd --timeout=900 --chdir /tmp/traprain-* --user=user --name=traprain -- sadt --verbose
parse:
pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'
--
GitLab