From 17ec0da760b74a4d0561df75081ae686ab3a1058 Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Wed, 12 Dec 2018 23:20:44 +0800
Subject: [PATCH] Update test cases for lava integration (group 0)

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 is the group 0 in a serie of commits to integrate all the
tests into LAVA.

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
---
 ...mer1.0.yaml => apparmor-gstreamer1-0.yaml} |  9 +++-
 test-cases/apparmor.yaml                      | 11 +++--
 test-cases/boot-performance-automated.yaml    |  9 +++-
 test-cases/canterbury.yaml                    | 12 +++--
 test-cases/cgroups-resource-control.yaml      |  8 +++-
 test-cases/check-dbus-services.yaml           | 14 ++++--
 test-cases/connman-new-supplicant.yaml        |  9 +++-
 test-cases/connman.yaml                       | 11 +++--
 test-cases/dbus-dos-reply-time.yaml           |  9 +++-
 test-cases/didcot.yaml                        |  9 +++-
 test-cases/folks-extended-info.yaml           | 17 ++++---
 test-cases/gettext-i18n.yaml                  |  9 +++-
 test-cases/glib-gio-fs.yaml                   |  9 +++-
 test-cases/grilo.yaml                         | 19 +++++---
 ...0-decode.yaml => gstreamer1-0-decode.yaml} |  9 +++-
 test-cases/gupnp-services.yaml                |  9 +++-
 test-cases/iptables-basic.yaml                |  9 +++-
 test-cases/libsoup-unit.yaml                  |  9 +++-
 test-cases/rhosydd.yaml                       | 47 ++++++++++---------
 .../tracker-indexing-local-storage.yaml       | 29 +++++++-----
 test-cases/tumbler-thumbnailing.yaml          |  9 +++-
 21 files changed, 192 insertions(+), 84 deletions(-)
 rename test-cases/{apparmor-gstreamer1.0.yaml => apparmor-gstreamer1-0.yaml} (86%)
 rename test-cases/{gstreamer1.0-decode.yaml => gstreamer1-0-decode.yaml} (84%)

diff --git a/test-cases/apparmor-gstreamer1.0.yaml b/test-cases/apparmor-gstreamer1-0.yaml
similarity index 86%
rename from test-cases/apparmor-gstreamer1.0.yaml
rename to test-cases/apparmor-gstreamer1-0.yaml
index 6e9ae3f..b6340c4 100644
--- a/test-cases/apparmor-gstreamer1.0.yaml
+++ b/test-cases/apparmor-gstreamer1-0.yaml
@@ -10,19 +10,24 @@ metadata:
   description: "Test that AppArmor profiles provided in GStreamer 1.0 works
                 without Auditd complaining."
 
-  macro_ostree_preconditions: apparmor-gstreamer1.0
-
   expected:
     - "The return value indicates the number of tests which failed and
        PASSED/FAILED/SKIP will be shown on console, something like this:"
     - |
         > /home/user/apparmor-gstreamer1.0-master/gstreamer1.0/R1.6-gstreamer-decode.sh: PASSED -
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor-gstreamer1.0.git
+      branch: master
+
 run:
   steps:
     # Use a timeout of 300s because some of the media file handling on embedded
     # devices can be slow. This test is purely for AppArmor, not multimedia
     # performance.
+    - "# Enter test directory:"
+    - cd apparmor-gstreamer1.0
     - "# Execute the following command:"
     - common/run-test-in-systemd --name run-test-sh --timeout 300 --user=user ./run-test.sh
 
diff --git a/test-cases/apparmor.yaml b/test-cases/apparmor.yaml
index adeb7c2..1cc9f4d 100644
--- a/test-cases/apparmor.yaml
+++ b/test-cases/apparmor.yaml
@@ -11,8 +11,6 @@ metadata:
                 the kernel and active is part of strategic application and
                 services confinement."
 
-  macro_ostree_preconditions: apparmor
-
   expected:
     - "The apparmor.sh script should return 0. The return value indicates the
        number of tests which failed. The ouput should be similar to the following
@@ -29,10 +27,17 @@ metadata:
     - "This testcase groups upstream developed tests mostly and therefore it's not
        runnning any Apertis specific test."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/apparmor.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apparmor
     - "# Execute the following command:"
-    - $ common/run-test-in-systemd --basename --timeout 3000 ./apparmor.sh
+    - common/run-test-in-systemd --basename --timeout 3000 ./apparmor.sh
   
 parse:
   fixupdict:
diff --git a/test-cases/boot-performance-automated.yaml b/test-cases/boot-performance-automated.yaml
index 5cdb18a..8c3102f 100644
--- a/test-cases/boot-performance-automated.yaml
+++ b/test-cases/boot-performance-automated.yaml
@@ -10,8 +10,6 @@ metadata:
   description: "Test boot performance. This test checks boot performance using
                 systemd-analyze statistics."
 
-  macro_ostree_preconditions: boot-performance-automated
-
   expected:
     - "The output should be similar to this:"
     - |
@@ -76,8 +74,15 @@ metadata:
         >>>> The following tests FAILED:
         [list of tests]
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/boot-performance-automated.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd boot-performance-automated
     - "common/run-test-in-systemd --timeout=900 --no-lava --name=boot-performance-automated sh -c './run-test.sh | sed \"/^(.*/ s/\\$/ :pass/\"'"
 
 parse:
diff --git a/test-cases/canterbury.yaml b/test-cases/canterbury.yaml
index 9c581cc..d2a092a 100644
--- a/test-cases/canterbury.yaml
+++ b/test-cases/canterbury.yaml
@@ -9,8 +9,6 @@ metadata:
   maintainer: "Apertis Project"
   description: "Test for Canterbury library."
 
-  macro_ostree_preconditions: canterbury
-
   expected:
     - "The output is extremely verbose. However, the relevant lines have the
        following structure:"
@@ -18,9 +16,17 @@ metadata:
         >==== TEST <testname> passed as <username> ====
         ==== TEST <testname> failed as <username> ====
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/canterbury.git
+      branch: master
+
 run:
   steps:
-  - common/run-test-in-systemd --timeout=900 --user=user --name=canterbury -- ./sadt.sh --verbose
+    - "# 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)'
diff --git a/test-cases/cgroups-resource-control.yaml b/test-cases/cgroups-resource-control.yaml
index 10b6769..d15ad13 100644
--- a/test-cases/cgroups-resource-control.yaml
+++ b/test-cases/cgroups-resource-control.yaml
@@ -9,7 +9,6 @@ metadata:
   maintainer: "Apertis Project"
   description: "Run cgroup resource control tests"
 
-  macro_ostree_preconditions: cgroups-resource-control
   pre-conditions:
     - "If running inside VirtualBox, disable the host I/O cache under \"storage\"
        in the image settings. Not doing so can cause the test_blkio_* tests to
@@ -31,8 +30,15 @@ metadata:
         >>>> The following tests FAILED:
         [list of tests]
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/cgroups-resource-control.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd cgroups-resource-control
     - "# Execute the following commands:"
     - common/run-test-in-systemd --name=cpu-shares --timeout=900 env DEBUG=2 ./cgroups-resource-control.sh test_cpu_shares
     - common/run-test-in-systemd --name=memory-limits --timeout=900 env DEBUG=2 ./cgroups-resource-control.sh test_memory_limits
diff --git a/test-cases/check-dbus-services.yaml b/test-cases/check-dbus-services.yaml
index 4791468..e54c680 100644
--- a/test-cases/check-dbus-services.yaml
+++ b/test-cases/check-dbus-services.yaml
@@ -11,8 +11,6 @@ metadata:
                 activated successfully as a systemd unit is part of strategic
                 basic services functionality."
 
-  macro_ostree_preconditions: check-dbus-services
-
   expected:
     - "The output should be a succession of tests similar to that:"
     - |
@@ -41,10 +39,18 @@ metadata:
     - |
         >RESULT:fail:
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/check-dbus-services.git
+      branch: master
+
 run:
   steps:
-  - common/run-test-in-systemd --user=user bin/check-dbus-services
-  - common/run-test-in-systemd bin/check-dbus-services
+    - "# Enter test directory:"
+    - cd check-dbus-services
+    - "# Execute the following commands:"
+    - common/run-test-in-systemd --user=user bin/check-dbus-services
+    - common/run-test-in-systemd bin/check-dbus-services
 
 parse:
   pattern: 'RESULT:(?P<result>\w+):(?P<test_case_id>[^:]+):'
diff --git a/test-cases/connman-new-supplicant.yaml b/test-cases/connman-new-supplicant.yaml
index 9cec558..ae222e9 100644
--- a/test-cases/connman-new-supplicant.yaml
+++ b/test-cases/connman-new-supplicant.yaml
@@ -9,8 +9,6 @@ metadata:
   maintainer: "Apertis Project"
   description: "Test the wpa_supplicant interface."
 
-  macro_ostree_preconditions: connman-new-supplicant
-
   expected:
     - "The output should be similar to that:"
     - |
@@ -21,8 +19,15 @@ metadata:
         >connman-new-supplicant
         FAILED
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/connman-new-supplicant.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd connman-new-supplicant
     - "# Execute the following command:"
     - common/run-test-in-systemd --timeout=900 --basename bin/connman-new-supplicant.sh
 
diff --git a/test-cases/connman.yaml b/test-cases/connman.yaml
index a179531..6917e22 100644
--- a/test-cases/connman.yaml
+++ b/test-cases/connman.yaml
@@ -12,8 +12,6 @@ metadata:
                 connection management: ensuring that ConnMan's APIs are accessible
                 is part of strategic network management functionality."
 
-  macro_ostree_preconditions: connman
-
   expected:
     - "An example output is:"
     - |
@@ -36,10 +34,17 @@ metadata:
     - "For ALL tests the enable step will give an \"In progress\" error if the
        device is already enabled. This is to be expected."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/connman.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd connman
     - "# Execute the following command:"
-    - $ common/run-test-in-systemd --timeout=900 --basename bin/connman-test.sh
+    - common/run-test-in-systemd --timeout=900 --basename bin/connman-test.sh
 
 parse:
   fixupdict:
diff --git a/test-cases/dbus-dos-reply-time.yaml b/test-cases/dbus-dos-reply-time.yaml
index 1a8f77f..6e87cbf 100644
--- a/test-cases/dbus-dos-reply-time.yaml
+++ b/test-cases/dbus-dos-reply-time.yaml
@@ -20,8 +20,6 @@ metadata:
 
                 DoS resistance is part of strategic basic services functionality."
 
-  macro_ostree_preconditions: dbus-dos-reply-time
-
   expected:
     - "There should be no error and it should show the time taken for every
        command."
@@ -32,8 +30,15 @@ metadata:
         test_heavy_load: command took 234ms (success), expected [0ms, 8000ms]
         test_match_rules: command took 2333ms (success), expected [0ms, 8000ms]
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/dbus-dos-reply-time.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd dbus-dos-reply-time
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --user=user --timeout=900 ./run-test.sh
 
diff --git a/test-cases/didcot.yaml b/test-cases/didcot.yaml
index 564180c..fcc7ea8 100644
--- a/test-cases/didcot.yaml
+++ b/test-cases/didcot.yaml
@@ -28,11 +28,16 @@ metadata:
 
 install:
   deps:
-  - gnome-desktop-testing
-  - didcot-tests
+    - gnome-desktop-testing
+    - didcot-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=didcot gnome-desktop-testing-runner didcot
 
diff --git a/test-cases/folks-extended-info.yaml b/test-cases/folks-extended-info.yaml
index f6e4834..d469287 100644
--- a/test-cases/folks-extended-info.yaml
+++ b/test-cases/folks-extended-info.yaml
@@ -16,15 +16,20 @@ metadata:
 
 install:
   deps:
-  - telepathy-ring
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
-  - chaiwala-tests
+    - chaiwala-tests
+    - telepathy-ring
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+  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-extended-info.sh"
 
diff --git a/test-cases/gettext-i18n.yaml b/test-cases/gettext-i18n.yaml
index f5e6c96..59c87d9 100644
--- a/test-cases/gettext-i18n.yaml
+++ b/test-cases/gettext-i18n.yaml
@@ -9,13 +9,18 @@ metadata:
   maintainer: "Apertis Project"
   description: "Check that gettext internationalization works."
 
-  macro_ostree_preconditions: gettext-i18n
-
   expected:
     - "The output should be pass or fail for each supported language."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/gettext-i18n.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd gettext-i18n
     - "# Execute the following command:"
     - common/run-test-in-systemd --timeout=900 --basename ./gettext-i18n.sh
 
diff --git a/test-cases/glib-gio-fs.yaml b/test-cases/glib-gio-fs.yaml
index d9a6b11..a7ba45b 100644
--- a/test-cases/glib-gio-fs.yaml
+++ b/test-cases/glib-gio-fs.yaml
@@ -9,8 +9,6 @@ metadata:
   maintainer: "Apertis Project"
   description: "Run the GLib gio tests that do I/O on the local filesystem."
 
-  macro_ostree_preconditions: glib-gio-fs
-
   expected:
     - "The output should be similar to this:"
     - |
@@ -55,8 +53,15 @@ metadata:
         > >>> The following tests FAILED:
         [list of tests]
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/glib-gio-fs.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd glib-gio-fs
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --timeout=900 ./run-test.sh
 
diff --git a/test-cases/grilo.yaml b/test-cases/grilo.yaml
index 3251604..255a2ab 100644
--- a/test-cases/grilo.yaml
+++ b/test-cases/grilo.yaml
@@ -52,16 +52,21 @@ metadata:
 
 install:
   deps:
-  - apertis-tests
-  - gir1.2-grilo-0.2
-  - grilo-plugins-0.2
-  - python3
-  - python3-gi
+    - apertis-tests
+    - gir1.2-grilo-0.2
+    - grilo-plugins-0.2
+    - python3
+    - python3-gi
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following command:"
-  - common/run-test-in-systemd --timeout=900 --basename grilo/automated/test-grilo.py
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following command:"
+    - common/run-test-in-systemd --timeout=900 --basename grilo/automated/test-grilo.py
 
 parse:
   pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$
diff --git a/test-cases/gstreamer1.0-decode.yaml b/test-cases/gstreamer1-0-decode.yaml
similarity index 84%
rename from test-cases/gstreamer1.0-decode.yaml
rename to test-cases/gstreamer1-0-decode.yaml
index fb4f4cd..8f57093 100644
--- a/test-cases/gstreamer1.0-decode.yaml
+++ b/test-cases/gstreamer1-0-decode.yaml
@@ -11,16 +11,21 @@ metadata:
                 Audio/video decoding through GStreamer is important but not
                 required by any of the currently strategic functionalities."
 
-  macro_ostree_preconditions: gstreamer1.0-decode
-
   expected:
     - "The script will output a result for each media file it tries to decode. If it succeeds, PASSED will be displayed. If not, FAILED will be displayed."
 
   notes:
     - "If lava-test-shell test fails within lava job. It means e.g. a job has timed out."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/gstreamer1.0-decode.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd gstreamer1.0-decode
     - "# Run the test script"
     - common/run-test-in-systemd --timeout=900 --basename bin/gstreamer1.0-decode.sh chaiwala-test-media
 
diff --git a/test-cases/gupnp-services.yaml b/test-cases/gupnp-services.yaml
index 34a32aa..bbdd506 100644
--- a/test-cases/gupnp-services.yaml
+++ b/test-cases/gupnp-services.yaml
@@ -9,13 +9,18 @@ metadata:
   maintainer: "Apertis Project"
   description: "Run a few tests related to service browsing, introspection, etc."
 
-  macro_ostree_preconditions: gupnp-services
-
   expected:
     - "PASS or FAIL for each test."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/gupnp-services.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd gupnp-services
     - "# Execute the following command:"
     - common/run-test-in-systemd --basename --timeout=900 ./run-test.sh
 
diff --git a/test-cases/iptables-basic.yaml b/test-cases/iptables-basic.yaml
index ec1b25c..ef1ed75 100644
--- a/test-cases/iptables-basic.yaml
+++ b/test-cases/iptables-basic.yaml
@@ -11,8 +11,6 @@ metadata:
                 and usable is part of strategic networking management
                 functionality."
 
-  macro_ostree_preconditions: iptables-basic
-
   expected:
     - "The automated test should succeed:"
     - |
@@ -27,8 +25,15 @@ metadata:
        before you start the tethering process."
     - "This test does not use nmap. Testing with nmap is done in another test."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/iptables-basic.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd iptables-basic
     - "# Execute the following command:"
     - common/run-test-in-systemd --timeout=900 --name=run-test env DEBUG=2 ./run-test.sh
 
diff --git a/test-cases/libsoup-unit.yaml b/test-cases/libsoup-unit.yaml
index cdb0e00..a5b9e23 100644
--- a/test-cases/libsoup-unit.yaml
+++ b/test-cases/libsoup-unit.yaml
@@ -15,11 +15,16 @@ metadata:
 
 install:
   deps:
-  - libsoup2.4-tests
-  - curl
+    - libsoup2.4-tests
+    - curl
+  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 --name=run-test --timeout=900 env DEBUG=2 libsoup/automated/run-test.sh
 
diff --git a/test-cases/rhosydd.yaml b/test-cases/rhosydd.yaml
index a066060..f56c382 100644
--- a/test-cases/rhosydd.yaml
+++ b/test-cases/rhosydd.yaml
@@ -21,31 +21,36 @@ metadata:
 
 install:
   deps:
-  - build-essential
-  - devscripts
-  - dpkg-dev
-  - gnome-desktop-testing
-  - libcroesor-0-dev
-  - libcroesor-0-tests
-  - librhosydd-0-dev
-  - librhosydd-0-tests
-  - python3-debian
-  - rhosydd
-  - rhosydd-tests
-  - rhosydd-tools
-  - rhosydd-mock-backends
+    - build-essential
+    - devscripts
+    - dpkg-dev
+    - gnome-desktop-testing
+    - libcroesor-0-dev
+    - libcroesor-0-tests
+    - librhosydd-0-dev
+    - librhosydd-0-tests
+    - python3-debian
+    - rhosydd
+    - rhosydd-tests
+    - rhosydd-tools
+    - rhosydd-mock-backends
   steps:
-  # Download in /tmp directory
-  - cd /tmp/
-  - apt source rhosydd
-  - chown user:user -R /tmp/rhosydd-*
+    # Download in /tmp directory
+    - cd /tmp/
+    - apt source rhosydd
+    - chown user:user -R /tmp/rhosydd-*
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - systemctl start rhosydd-mock-backend.service
-  - systemctl start rhosydd-speedo-backend.service
-  - common/run-test-in-systemd --timeout=900 --chdir /tmp/rhosydd-* --user=user --name=rhosydd -- sadt --verbose
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - systemctl start rhosydd-mock-backend.service
+    - systemctl start rhosydd-speedo-backend.service
+    - common/run-test-in-systemd --timeout=900 --chdir /tmp/rhosydd-* --user=user --name=rhosydd -- sadt --verbose
 
 parse:
   pattern: '^(?P<test_case_id>[a-zA-Z0-9_\-\./]+)\s...\s(?P<result>ok|FAIL|SKIP)'
diff --git a/test-cases/tracker-indexing-local-storage.yaml b/test-cases/tracker-indexing-local-storage.yaml
index ab517da..734c451 100644
--- a/test-cases/tracker-indexing-local-storage.yaml
+++ b/test-cases/tracker-indexing-local-storage.yaml
@@ -44,22 +44,27 @@ metadata:
 
 install:
   deps:
-  - apertis-tests
-  - gir1.2-grilo-0.2
-  - gir1.2-tracker-1.0
-  - python3
-  - python3-gi
-  - tracker
-  - wget
+    - apertis-tests
+    - gir1.2-grilo-0.2
+    - gir1.2-tracker-1.0
+    - python3
+    - python3-gi
+    - tracker
+    - wget
   steps:
-  - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
-  - mkdir -p /home/shared/
-  - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+    - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
+    - mkdir -p /home/shared/
+    - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following command:"
-  - common/run-test-in-systemd --user=user --name=run-test --timeout=900 tracker/automated/test-tracker.py
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following command:"
+    - common/run-test-in-systemd --user=user --name=run-test --timeout=900 tracker/automated/test-tracker.py
 
 parse:
   pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$
diff --git a/test-cases/tumbler-thumbnailing.yaml b/test-cases/tumbler-thumbnailing.yaml
index bd47b34..c3cd98e 100644
--- a/test-cases/tumbler-thumbnailing.yaml
+++ b/test-cases/tumbler-thumbnailing.yaml
@@ -10,8 +10,6 @@ metadata:
                 properly (large, small, videos, documents, images)."
   maintainer: "Apertis Project"
 
-  macro_ostree_preconditions: tumbler-thumbnailing
-
   expected:
     - "The output should be similar to:"
     - |
@@ -27,8 +25,15 @@ metadata:
         >>>> The following tests FAILED:
         [list of tests]
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/tests/tumbler-thumbnailing.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd tumbler-thumbnailing
     - "# Run the test script:"
     - common/run-test-in-systemd --timeout=900 --user=user --name=run-test env DEBUG=2 ./run-test.sh
 
-- 
GitLab