From f73d996237a400389a52839558f2048dcc84648e Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Fri, 11 Jan 2019 23:26:07 +0800
Subject: [PATCH] Rename image-type to image-variant

This commit renames the image-type field to image-variant
in the test cases files.

It also updates the parser, renderer code, test_case template
and unittests files in order to use the new name.

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
---
 atc_renderer/parser.py                        |   6 +-
 atc_renderer/renderer.py                      |   2 +-
 atc_renderer/templates/test_case.html         |   4 +-
 atc_renderer/tests.py                         |   2 +-
 atc_renderer/tests_files/test_file1.html      |  54 ++---
 atc_renderer/tests_files/test_file1.yaml      |  38 ++--
 atc_renderer/tests_files/test_file2.html      | 207 ++++++++++++++++++
 atc_renderer/tests_files/test_file2.yaml      |   2 +-
 atc_renderer/tests_files/test_file3.html      |   2 +-
 atc_renderer/tests_files/test_file3.yaml      |   2 +-
 atc_renderer/tests_files/test_file4.html      |  30 +--
 atc_renderer/tests_files/test_file4.yaml      |  13 +-
 atc_renderer/tests_files/test_file5.html      |   2 +-
 atc_renderer/tests_files/test_file5.yaml      |   2 +-
 ...abstract-contact-addressbook-creation.yaml |   2 +-
 test-cases/ade-commands.yaml                  |   2 +-
 test-cases/apertis-update-manager-api.yaml    |   2 +-
 .../apertis-update-manager-automount.yaml     |   2 +-
 .../apertis-update-manager-diskfull.yaml      |   2 +-
 test-cases/apertis-update-manager-manual.yaml |   2 +-
 .../apertis-update-manager-powercut.yaml      |   2 +-
 .../apertis-update-manager-rollback.yaml      |   2 +-
 .../apertis-update-manager-usb-unplug.yaml    |   2 +-
 test-cases/apparmor-basic-profiles.yaml       |   2 +-
 test-cases/apparmor-bluez-avrcp-volume.yaml   |   2 +-
 test-cases/apparmor-bluez-setup.yaml          |   2 +-
 test-cases/apparmor-bluez.yaml                |   2 +-
 test-cases/apparmor-chaiwala-system.yaml      |   2 +-
 test-cases/apparmor-dbus.yaml                 |   2 +-
 test-cases/apparmor-folks.yaml                |   2 +-
 test-cases/apparmor-functional-demo.yaml      |   2 +-
 test-cases/apparmor-geoclue.yaml              |   2 +-
 test-cases/apparmor-gstreamer1-0.yaml         |   2 +-
 test-cases/apparmor-ofono.yaml                |   2 +-
 test-cases/apparmor-pulseaudio.yaml           |   2 +-
 .../apparmor-session-lockdown-no-deny.yaml    |   2 +-
 test-cases/apparmor-tracker.yaml              |   2 +-
 test-cases/apparmor-tumbler.yaml              |   2 +-
 test-cases/apparmor-utils.yaml                |   2 +-
 test-cases/apparmor.yaml                      |   2 +-
 test-cases/bluez-avrcp-volume.yaml            |   2 +-
 test-cases/bluez-hfp.yaml                     |   2 +-
 test-cases/bluez-phone.yaml                   |   2 +-
 test-cases/bluez-setup.yaml                   |   2 +-
 test-cases/boot-no-crashes.yaml               |   2 +-
 test-cases/boot-performance.yaml              |   2 +-
 test-cases/canterbury.yaml                    |   2 +-
 test-cases/cgroups-resource-control.yaml      |   2 +-
 test-cases/check-dbus-services.yaml           |   2 +-
 test-cases/check-tiny-system-container.yaml   |   2 +-
 test-cases/check-tiny-user-container.yaml     |   2 +-
 test-cases/connman-new-supplicant.yaml        |   2 +-
 test-cases/connman-pan-network-access.yaml    |   2 +-
 test-cases/connman-pan-tethering.yaml         |   2 +-
 test-cases/connman-services.yaml              |   2 +-
 test-cases/connman-usb-tethering.yaml         |   2 +-
 test-cases/connman.yaml                       |   2 +-
 test-cases/dbus-dos-reply-time.yaml           |   2 +-
 test-cases/dbus-installed-tests.yaml          |   2 +-
 test-cases/didcot.yaml                        |   2 +-
 .../eclipse-plugins-install-target.yaml       |   2 +-
 .../eclipse-plugins-remote-debugging.yaml     |   2 +-
 test-cases/eclipse-sysroot-management.yaml    |   2 +-
 test-cases/evolution-sync-bluetooth.yaml      |   2 +-
 test-cases/folks-alias-persistence.yaml       |   2 +-
 test-cases/folks-eds-compatibility.yaml       |   2 +-
 test-cases/folks-extended-info.yaml           |   2 +-
 .../folks-metacontacts-antilinking.yaml       |   2 +-
 test-cases/folks-metacontacts-linking.yaml    |   2 +-
 test-cases/folks-metacontacts-unlinking.yaml  |   2 +-
 test-cases/folks-ofono-backend.yaml           |   2 +-
 test-cases/folks-search-contacts.yaml         |   2 +-
 test-cases/folks-sync-only.yaml               |   2 +-
 test-cases/frome.yaml                         |   2 +-
 test-cases/gettext-i18n.yaml                  |   2 +-
 test-cases/glib-gio-fs.yaml                   |   2 +-
 test-cases/grilo.yaml                         |   2 +-
 test-cases/gstreamer1-0-decode.yaml           |   2 +-
 test-cases/gupnp-services.yaml                |   2 +-
 test-cases/image-bootable.yaml                |   2 +-
 test-cases/image-gui-start.yaml               |   2 +-
 test-cases/iptables-basic.yaml                |   2 +-
 test-cases/iptables-nmap.yaml                 |   2 +-
 test-cases/libsoup-unit.yaml                  |   2 +-
 test-cases/newport.yaml                       |   2 +-
 test-cases/ofono-sms-receive.yaml             |   2 +-
 test-cases/ofono-sms-send.yaml                |   2 +-
 test-cases/polkit-parsing.yaml                |   2 +-
 test-cases/rfkill-toggle.yaml                 |   2 +-
 test-cases/rhosydd.yaml                       |   2 +-
 test-cases/ribchester.yaml                    |   2 +-
 test-cases/sanity-check.yaml                  |   2 +-
 test-cases/sdk-ade-remote-debugging.yaml      |   2 +-
 test-cases/sdk-code-analysis-tools-gcov.yaml  |   2 +-
 .../sdk-code-analysis-tools-splint.yaml       |   2 +-
 test-cases/sdk-cross-compilation.yaml         |   2 +-
 test-cases/sdk-dbus-tools-bustle.yaml         |   2 +-
 test-cases/sdk-dbus-tools-d-feet.yaml         |   2 +-
 test-cases/sdk-debug-tools-gdb.yaml           |   2 +-
 test-cases/sdk-debug-tools-strace.yaml        |   2 +-
 test-cases/sdk-debug-tools-valgrind.yaml      |   2 +-
 test-cases/sdk-ide-build-run-program.yaml     |   2 +-
 test-cases/sdk-performance-tools-gprof.yaml   |   2 +-
 test-cases/sdk-performance-tools-sysprof.yaml |   2 +-
 test-cases/sdk-vb-fullscreen.yaml             |   2 +-
 test-cases/telepathy-ring-automated.yaml      |   2 +-
 test-cases/telepathy-ring.yaml                |   2 +-
 .../tracker-indexing-local-storage.yaml       |   2 +-
 test-cases/tracker-indexing-mass-storage.yaml |   2 +-
 test-cases/traffic-control-basic.yaml         |   2 +-
 test-cases/traprain.yaml                      |   2 +-
 test-cases/tumbler-thumbnailing.yaml          |   2 +-
 test-cases/video-animation-on-boot.yaml       |   2 +-
 test-cases/webkit2gtk-ac-3d-rendering.yaml    |   2 +-
 test-cases/webkit2gtk-ac-animations.yaml      |   2 +-
 test-cases/webkit2gtk-ac-scrolling.yaml       |   2 +-
 test-cases/webkit2gtk-actor-tiles.yaml        |   2 +-
 test-cases/webkit2gtk-aligned-scroll.yaml     |   2 +-
 test-cases/webkit2gtk-contextual-zoom.yaml    |   2 +-
 test-cases/webkit2gtk-drag-and-drop.yaml      |   2 +-
 .../webkit2gtk-event-handling-redesign.yaml   |   2 +-
 test-cases/webkit2gtk-gstreamer1.0.yaml       |   2 +-
 test-cases/webkit2gtk-lazy-click.yaml         |   2 +-
 test-cases/webkit2gtk-mt-touch-events.yaml    |   2 +-
 test-cases/x-hw-accelerated.yaml              |   2 +-
 125 files changed, 394 insertions(+), 194 deletions(-)
 create mode 100644 atc_renderer/tests_files/test_file2.html

diff --git a/atc_renderer/parser.py b/atc_renderer/parser.py
index 76a3a454..bc4b5fc7 100644
--- a/atc_renderer/parser.py
+++ b/atc_renderer/parser.py
@@ -26,7 +26,7 @@ import yaml
 
 from atc_renderer.exceptions import ParserTypeError, ParserMissingFieldError
 
-image_types = [ "any", "development", "minimal", "SDK", "target", "tiny-lxc" ]
+image_variants = [ "any", "development", "minimal", "SDK", "target", "tiny-lxc" ]
 image_arch = ['any', 'amd64', 'arm64', 'armhf']
 tests_types = ['compatibility', 'functional', 'performance', 'sanity', 'system']
 priorities = ['critical', 'high', 'low', 'medium']
@@ -37,7 +37,7 @@ test_case_format = {
     'metadata': (True, {
         'name':            (True,  ""),
         'format':          (False, ""),
-        'image-type':      (True,  image_types),
+        'image-variant':   (True,  image_variants),
         'image-arch':      (True,  image_arch),
         'type':            (True,  tests_types),
         'exec-type':       (True,  execution_type),
@@ -72,7 +72,7 @@ def _parse_format(test_case, test_case_format):
             continue
 
         if type(value) == str and type(valuef) == list:
-            if tagf in ['image-type' , 'image-arch', 'type',
+            if tagf in ['image-variant' , 'image-arch', 'type',
                         'exec-type', 'priority']:
                 try:
                     valuef.index(value)
diff --git a/atc_renderer/renderer.py b/atc_renderer/renderer.py
index c05dd7ad..a01cee74 100644
--- a/atc_renderer/renderer.py
+++ b/atc_renderer/renderer.py
@@ -99,7 +99,7 @@ def get_template_values(testcase_data):
         print("Error: missing mandatory field metadata")
         exit(1)
 
-    for mv in ['name', 'image-type', 'image-arch', 'type',
+    for mv in ['name', 'image-variant', 'image-arch', 'type',
                'exec-type', 'priority', 'description', 'expected']:
         value = metadata.get(mv)
         if value:
diff --git a/atc_renderer/templates/test_case.html b/atc_renderer/templates/test_case.html
index c76ba814..63d4cf89 100644
--- a/atc_renderer/templates/test_case.html
+++ b/atc_renderer/templates/test_case.html
@@ -15,8 +15,8 @@
       <div class="card" style="margin-top: 20px">
 	<div class="card-body">
 	  <dl class="row">
-	    <dt class="col-sm-3">Image Type:</dt>
-	    <dd class="col-sm-9">{{ image_type }}</dd>
+	    <dt class="col-sm-3">Image Variant:</dt>
+	    <dd class="col-sm-9">{{ image_variant }}</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">{{ image_arch }}</dd>
 	    <dt class="col-sm-3">Type:</dt>
diff --git a/atc_renderer/tests.py b/atc_renderer/tests.py
index dd6894af..4cf2e964 100644
--- a/atc_renderer/tests.py
+++ b/atc_renderer/tests.py
@@ -108,7 +108,7 @@ class TestMissingFields(unittest.TestCase):
 
     def test_missing_image_type_field(self):
         tc_file = copy.deepcopy(self.test_file)
-        tc_file['metadata'].pop('image-type')
+        tc_file['metadata'].pop('image-variant')
         with self.assertRaises(ParserMissingFieldError):
             parse_format(tc_file)
 
diff --git a/atc_renderer/tests_files/test_file1.html b/atc_renderer/tests_files/test_file1.html
index fd24f050..5c8a9c71 100644
--- a/atc_renderer/tests_files/test_file1.html
+++ b/atc_renderer/tests_files/test_file1.html
@@ -15,7 +15,7 @@
       <div class="card" style="margin-top: 20px">
 	<div class="card-body">
 	  <dl class="row">
-	    <dt class="col-sm-3">Image Type:</dt>
+	    <dt class="col-sm-3">Image Variant:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
@@ -36,23 +36,26 @@
       
       
       
+  <li class="mb-sm-2">Clone the tests repository from another computer <i>(Note that the branch being tested may change depending on the release, please make sure to clone the correct branch for the release in question)</i>:</li>
+  <p><kbd>$ git clone --branch master https://gitlab.apertis.org/infrastructure/apertis-tests.git</kbd></p>
+  <li class="mb-sm-2">Copy the test directory apertis-tests to the target device:</li>
+  <p><kbd>$ DUT_IP=&ltdevice-ip&gt</kbd></p>
+  <p><kbd>$ scp -r apertis-tests user@$DUT_IP:</kbd></p>
+  <li class="mb-sm-2">Log into the target device:</li>
+  <p><kbd>$ ssh user@$DUT_IP</kbd></p>
+
       
-      <li class="mb-sm-2">A second system with a terminal and git available on it. This test must be executed before other tests and even before installing other packages in the image, so the script to execute this test should be fetched from a different machine.</li>
-      
-      
-      
-      
-      <li class="mb-sm-2">Clone the apertis-tests repository in the second system:</li>
+      <li class="mb-sm-2">A second system with a terminal and git available on it is required in order to run the above steps.</li>
       
       
       
       
+      <li class="mb-sm-2">This test must be executed before other tests and even before installing other packages in the image, so the script to execute this test should be fetched from a different machine.</li>
       
-      <p><kbd>$ git clone https://gitlab.apertis.org/infrastructure/apertis-tests.git</kbd></p>
       
       
       
-      <li class="mb-sm-2">Copy the apertis-tests folder to the Apertis system. Since the Apertis image runs sshd by default, you can easily copy this file using the scp utility from the second machine, for this you will need the Apertis image IP, which you can find running the ip command from Apertis:</li>
+      <li class="mb-sm-2">Since the Apertis image runs sshd by default, you can easily copy this file using the scp utility from the second machine, for this you will need the Apertis image IP, which you can find running the ip command from Apertis:</li>
       
       
       
@@ -62,47 +65,30 @@
       
       
       
-      <li class="mb-sm-2">Replace &lt;APERTIS_IMAGE_IP&gt; by the found IP and copy the apertis-tests repository using scp from the second system where the apertis-tests repository was cloned. It would look like this:</li>
-      
-      
-      
-      
-      
-      <p><kbd>$ tar cf apertis-tests.tar apertis-tests/ &amp;&amp; scp apertis-tests.tar user@&lt;APERTIS_IMAGE_IP&gt;:/home/user/</kbd></p>
-      
-      
-      
       <li class="mb-sm-2">Alternatively, you can copy the apertis-tests directory in other ways, for example by using an external storage device, manually mounting the device and copying the folder. It is recommended and expected that you use scp from a second machine.</li>
       
       
       
       
-      <li class="mb-sm-2">Once the apertis-tests folder is available in the Apertis image, unpack it in the apertis home user directory:</li>
-      
-      
+      <li class="mb-sm-2">Once the apertis-tests folder is available in the Apertis image, follow the execution steps.</li>
       
       
       
-      <p><kbd>$ tar xf apertis-tests.tar</kbd></p>
-      
-      
-      
-      <li class="mb-sm-2">Enter the apertis-tests directory</li>
-      
       
+      </ol>
       
+
+      <hr />
+      <h4>Execution Steps</h4>
+      <ol>
       
+      <li class="mb-sm-2"> Enter test directory:</li>
       
-      <p><kbd>$ cd apertis-tests/</kbd></p>
       
       
       
-      </ol>
+      <p><kbd>$ cd apertis-tests</kbd></p>
       
-
-      <hr />
-      <h4>Execution Steps</h4>
-      <ol>
       
       <li class="mb-sm-2"> Execute the following command:</li>
       
diff --git a/atc_renderer/tests_files/test_file1.yaml b/atc_renderer/tests_files/test_file1.yaml
index ad040da7..2ee2fec6 100644
--- a/atc_renderer/tests_files/test_file1.yaml
+++ b/atc_renderer/tests_files/test_file1.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sanity-check
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: sanity
   exec-type: all
@@ -15,30 +15,21 @@ metadata:
                 Basic functionality: services."
 
   pre-conditions:
-    - "A second system with a terminal and git available on it. This test must be
-       executed before other tests and even before installing other packages in
-       the image, so the script to execute this test should be fetched from a
-       different machine."
-    - "Clone the apertis-tests repository in the second system:"
-    - $ git clone https://gitlab.apertis.org/infrastructure/apertis-tests.git
-    - "Copy the apertis-tests folder to the Apertis system. Since the Apertis
-       image runs sshd by default, you can easily copy this file using the scp
-       utility from the second machine, for this you will need the Apertis image
-       IP, which you can find running the ip command from Apertis:"
+    - "A second system with a terminal and git available on it is required in order
+       to run the above steps."
+    - "This test must be executed before other tests and even before installing
+       other packages in the image, so the script to execute this test should be
+       fetched from a different machine."
+    - "Since the Apertis image runs sshd by default, you can easily copy this file
+       using the scp utility from the second machine, for this you will need the
+       Apertis image IP, which you can find running the ip command from Apertis:"
     - $ ip addr
-    - "Replace <APERTIS_IMAGE_IP> by the found IP and copy the apertis-tests
-       repository using scp from the second system where the apertis-tests
-       repository was cloned. It would look like this:"
-    - $ tar cf apertis-tests.tar apertis-tests/ && scp apertis-tests.tar user@<APERTIS_IMAGE_IP>:/home/user/
     - "Alternatively, you can copy the apertis-tests directory in other ways, for
        example by using an external storage device, manually mounting the device
        and copying the folder. It is recommended and expected that you use scp
        from a second machine."
-    - "Once the apertis-tests folder is available in the Apertis image, unpack it
-       in the apertis home user directory:"
-    - $ tar xf apertis-tests.tar
-    - "Enter the apertis-tests directory"
-    - $ cd apertis-tests/
+    - "Once the apertis-tests folder is available in the Apertis image, follow the
+       execution steps."
 
   expected:
     - "The command should report no failure and its output should be something
@@ -59,8 +50,15 @@ metadata:
     - "This test must be executed in an image before running either automated or
        manual tests."
 
+install:
+  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/sanity-check
 
diff --git a/atc_renderer/tests_files/test_file2.html b/atc_renderer/tests_files/test_file2.html
new file mode 100644
index 00000000..30472ae6
--- /dev/null
+++ b/atc_renderer/tests_files/test_file2.html
@@ -0,0 +1,207 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <title>webkit2gtk-actor-tiles</title>
+  </head>
+  <body>
+    
+    <main role="main" class="container" style="margin-top: 40px; margin-bottom: 40px">
+      <h2>webkit2gtk-actor-tiles <small class="text-muted">manual</small></h2>
+      <h3><span class="badge badge-info">medium</span></h3>
+
+      <div class="card" style="margin-top: 20px">
+	<div class="card-body">
+	  <dl class="row">
+	    <dt class="col-sm-3">Image Variant:</dt>
+	    <dd class="col-sm-9">target</dd>
+	    <dt class="col-sm-3">Image Architecture:</dt>
+	    <dd class="col-sm-9">any</dd>
+	    <dt class="col-sm-3">Type:</dt>
+	    <dd class="col-sm-9">functional</dd>
+	  </dl>
+
+      <h4>Description</h4>
+      <p>Test implementation of actor-based tiled backing store in webkit2gtk.</p>
+
+      
+      <hr />
+      <h4>Resources</h4>
+      <ul>
+      
+      <li>Mouse or touchscreen.</li>
+      
+      </ul>
+      
+
+      
+      <hr />
+      <h4>Pre Conditions</h4>
+      <ol>
+      
+      
+  <li class="mb-sm-2">Ensure Rootfs is remounted as read/write.</li>
+  <p><kbd>$ sudo mount -o remount,rw /</kbd></p>
+  <li class="mb-sm-2">Install dependencies</li>
+  <p><kbd>$ sudo apt install webkit2gtk-testing</kbd></p>
+  <li class="mb-sm-2">Restart the system to restore the filesystem state to read-only before running the test.</li>
+  <p><kbd>$ sudo reboot</kbd></p>
+
+      
+      
+      
+      </ol>
+      
+
+      <hr />
+      <h4>Execution Steps</h4>
+      <ol>
+      
+      <li class="mb-sm-2">Launch the test application with each URL in resources with and without CLUTTER_PAINT=paint-volumes:</li>
+      
+      
+      
+      
+      <p><kbd>$ env CLUTTER_PAINT=paint-volumes GtkClutterLauncher file:///usr/share/webkit2gtk/testing/actor-tiles-test.html</kbd></p>
+      
+      
+      <li class="mb-sm-2">Check that the rendering of the page matches the reference in the results section.</li>
+      
+      
+      
+      <li class="mb-sm-2">Click the link that will scroll the page a bit</li>
+      
+      
+      
+      <li class="mb-sm-2">Check that the rendering of the page matches the reference in the results section</li>
+      
+      
+      
+      <li class="mb-sm-2">Click the link that will scroll to the very bottom</li>
+      
+      
+      
+      <li class="mb-sm-2">Check that the rendering of the page matches the reference in the results section</li>
+      
+      
+      
+      <li class="mb-sm-2">Click the first link that will take you to a different page</li>
+      
+      
+      
+      <li class="mb-sm-2">Check that the rendering of the page matches the reference in the results section</li>
+      
+      
+      
+      <li class="mb-sm-2">Click the back button of the browser</li>
+      
+      
+      
+      <li class="mb-sm-2">Check that the rendering of the page matches the reference in the results section</li>
+      
+      
+      
+      <li class="mb-sm-2">Click the second link, that will send you to the bottom</li>
+      
+      
+      
+      <li class="mb-sm-2">Follow the links again until you get to the end of the page again, always making sure the rendering matches the reference rendering</li>
+      
+      
+      
+      </ol>
+
+      <hr />
+      <h4>Expected</h4>
+      
+      <p class="mt-sm-3">This test will be considered a PASS if it works with at least one of mouse or touchpad because this is not a test for the mouse or touchpad working.</p>
+      
+      
+      
+      
+      
+      <p class="mt-sm-3">The page will look like this after the first load:</p>
+      
+      
+      
+      
+      
+      
+      
+      
+      <img src="images/Actor-tiles-01.png" class="img-fluid">
+      
+      
+      <p class="mt-sm-3">After clicking the first link the page will look like this:</p>
+      
+      
+      
+      
+      
+      
+      
+      
+      <img src="images/Actor-tiles-02.png" class="img-fluid">
+      
+      
+      <p class="mt-sm-3">After clicking the second link the page will look like this:</p>
+      
+      
+      
+      
+      
+      
+      
+      
+      <img src="images/Actor-tiles-03.png" class="img-fluid">
+      
+      
+      <p class="mt-sm-3">The new page that will be loaded looks like this:</p>
+      
+      
+      
+      
+      
+      
+      
+      
+      <img src="images/Actor-tiles-04.png" class="img-fluid">
+      
+      
+      <p class="mt-sm-3">Going back should give you the same rendering you had before clicking the link to the new page, except the link will be colored purple.</p>
+      
+      
+      
+      
+      
+      
+      
+      
+      <img src="images/Actor-tiles-05.png" class="img-fluid">
+      
+      
+      <p class="mt-sm-3">After clicking the link that will take you to the beginning of the page and repeating the process, the renderings should be the same as the ones above.</p>
+      
+      
+      
+      
+      
+      <p class="mt-sm-3">Note that when a page starts loading some of the tiles may contain a checker board; that is normal, but we plan to improve on it.</p>
+      
+      
+      
+      
+      
+
+      
+
+	</div>
+      </div>
+
+      
+    </main>
+
+  </body>
+</html>
\ No newline at end of file
diff --git a/atc_renderer/tests_files/test_file2.yaml b/atc_renderer/tests_files/test_file2.yaml
index ef73d205..01d886ab 100644
--- a/atc_renderer/tests_files/test_file2.yaml
+++ b/atc_renderer/tests_files/test_file2.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-actor-tiles
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/atc_renderer/tests_files/test_file3.html b/atc_renderer/tests_files/test_file3.html
index 41add8ae..1042bcbe 100644
--- a/atc_renderer/tests_files/test_file3.html
+++ b/atc_renderer/tests_files/test_file3.html
@@ -15,7 +15,7 @@
       <div class="card" style="margin-top: 20px">
 	<div class="card-body">
 	  <dl class="row">
-	    <dt class="col-sm-3">Image Type:</dt>
+	    <dt class="col-sm-3">Image Variant:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
diff --git a/atc_renderer/tests_files/test_file3.yaml b/atc_renderer/tests_files/test_file3.yaml
index 8c8e31d3..8ae601cf 100644
--- a/atc_renderer/tests_files/test_file3.yaml
+++ b/atc_renderer/tests_files/test_file3.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/atc_renderer/tests_files/test_file4.html b/atc_renderer/tests_files/test_file4.html
index 7b1fd665..8f453664 100644
--- a/atc_renderer/tests_files/test_file4.html
+++ b/atc_renderer/tests_files/test_file4.html
@@ -15,7 +15,7 @@
       <div class="card" style="margin-top: 20px">
 	<div class="card-body">
 	  <dl class="row">
-	    <dt class="col-sm-3">Image Type:</dt>
+	    <dt class="col-sm-3">Image Variant:</dt>
 	    <dd class="col-sm-9">target</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
@@ -33,22 +33,18 @@
       <h4>Pre Conditions</h4>
       <ol>
       
-  <li class="mb-sm-2">From a PC, download and unpack the test data tarball from the gitlab test repository:</li>
-  <p><kbd>$ wget https://gitlab.apertis.org/tests/apparmor/-/archive/master/apparmor.tar.gz</kbd></p>
-  <p><kbd>$ tar -xvf apparmor.tar.gz</kbd></p>
-  <li class="mb-sm-2">Copy the apparmor-master-* to the target device:</li>
+      
+      
+      
+  <li class="mb-sm-2">Clone the tests repository from another computer <i>(Note that the branch being tested may change depending on the release, please make sure to clone the correct branch for the release in question)</i>:</li>
+  <p><kbd>$ git clone --branch master https://gitlab.apertis.org/tests/apparmor.git</kbd></p>
+  <li class="mb-sm-2">Copy the test directory apparmor to the target device:</li>
   <p><kbd>$ DUT_IP=&ltdevice-ip&gt</kbd></p>
-  <p><kbd>$ scp -r apparmor-master-* user@$DUT_IP:</kbd></p>
+  <p><kbd>$ scp -r apparmor user@$DUT_IP:</kbd></p>
   <li class="mb-sm-2">Log into the target device:</li>
   <p><kbd>$ ssh user@$DUT_IP</kbd></p>
-  <li class="mb-sm-2">After log into the DUT, enter the test directory</li>
-  <p><kbd>$ cd apparmor-master-*</kbd></p>
-  <li class="mb-sm-2">Note that the tarball may change depending on the release/branch being tested, please make sure to download the correct tarball for the release in question.</li>
 
       
-      
-      
-      
       </ol>
       
 
@@ -56,12 +52,20 @@
       <h4>Execution Steps</h4>
       <ol>
       
+      <li class="mb-sm-2"> Enter test directory:</li>
+      
+      
+      
+      
+      <p><kbd>$ cd apparmor</kbd></p>
+      
+      
       <li class="mb-sm-2"> Execute the following command:</li>
       
       
       
       
-      <p><kbd>$ $ common/run-test-in-systemd --basename --timeout 3000 ./apparmor.sh</kbd></p>
+      <p><kbd>$ common/run-test-in-systemd --basename --timeout 3000 ./apparmor.sh</kbd></p>
       
       
       </ol>
diff --git a/atc_renderer/tests_files/test_file4.yaml b/atc_renderer/tests_files/test_file4.yaml
index adeb7c21..d6c9f1b7 100644
--- a/atc_renderer/tests_files/test_file4.yaml
+++ b/atc_renderer/tests_files/test_file4.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
@@ -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/atc_renderer/tests_files/test_file5.html b/atc_renderer/tests_files/test_file5.html
index 5cda47da..e50d9243 100644
--- a/atc_renderer/tests_files/test_file5.html
+++ b/atc_renderer/tests_files/test_file5.html
@@ -15,7 +15,7 @@
       <div class="card" style="margin-top: 20px">
 	<div class="card-body">
 	  <dl class="row">
-	    <dt class="col-sm-3">Image Type:</dt>
+	    <dt class="col-sm-3">Image Variant:</dt>
 	    <dd class="col-sm-9">any</dd>
 	    <dt class="col-sm-3">Image Architecture:</dt>
 	    <dd class="col-sm-9">any</dd>
diff --git a/atc_renderer/tests_files/test_file5.yaml b/atc_renderer/tests_files/test_file5.yaml
index c93293c3..50d98c7a 100644
--- a/atc_renderer/tests_files/test_file5.yaml
+++ b/atc_renderer/tests_files/test_file5.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: ribchester
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/abstract-contact-addressbook-creation.yaml b/test-cases/abstract-contact-addressbook-creation.yaml
index 2e39cb81..d0b6550d 100644
--- a/test-cases/abstract-contact-addressbook-creation.yaml
+++ b/test-cases/abstract-contact-addressbook-creation.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: abstract-contact-addressbook-creation
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/ade-commands.yaml b/test-cases/ade-commands.yaml
index 1fb49a64..a660cbd0 100644
--- a/test-cases/ade-commands.yaml
+++ b/test-cases/ade-commands.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: ade-commands
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/apertis-update-manager-api.yaml b/test-cases/apertis-update-manager-api.yaml
index 20eee34b..ef4c9df2 100644
--- a/test-cases/apertis-update-manager-api.yaml
+++ b/test-cases/apertis-update-manager-api.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager-api
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apertis-update-manager-automount.yaml b/test-cases/apertis-update-manager-automount.yaml
index be7c486f..7a8fe7c0 100644
--- a/test-cases/apertis-update-manager-automount.yaml
+++ b/test-cases/apertis-update-manager-automount.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager-auto
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apertis-update-manager-diskfull.yaml b/test-cases/apertis-update-manager-diskfull.yaml
index eac20ca0..fd4c7b37 100644
--- a/test-cases/apertis-update-manager-diskfull.yaml
+++ b/test-cases/apertis-update-manager-diskfull.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager-diskfull
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apertis-update-manager-manual.yaml b/test-cases/apertis-update-manager-manual.yaml
index a2ce0aca..4555afe0 100644
--- a/test-cases/apertis-update-manager-manual.yaml
+++ b/test-cases/apertis-update-manager-manual.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apertis-update-manager-powercut.yaml b/test-cases/apertis-update-manager-powercut.yaml
index 6e46dc15..6e2ed314 100644
--- a/test-cases/apertis-update-manager-powercut.yaml
+++ b/test-cases/apertis-update-manager-powercut.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager-powercut
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apertis-update-manager-rollback.yaml b/test-cases/apertis-update-manager-rollback.yaml
index f6aaef74..138c7c50 100644
--- a/test-cases/apertis-update-manager-rollback.yaml
+++ b/test-cases/apertis-update-manager-rollback.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager-rollback
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apertis-update-manager-usb-unplug.yaml b/test-cases/apertis-update-manager-usb-unplug.yaml
index 3fd2b96d..65d83027 100644
--- a/test-cases/apertis-update-manager-usb-unplug.yaml
+++ b/test-cases/apertis-update-manager-usb-unplug.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apertis-update-manager-usb-unplug
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: armhf
   type: functional
   exec-type: manual
diff --git a/test-cases/apparmor-basic-profiles.yaml b/test-cases/apparmor-basic-profiles.yaml
index a3559204..727ff232 100644
--- a/test-cases/apparmor-basic-profiles.yaml
+++ b/test-cases/apparmor-basic-profiles.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-basic-profiles
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-bluez-avrcp-volume.yaml b/test-cases/apparmor-bluez-avrcp-volume.yaml
index 21d2ecb2..3cf2a090 100644
--- a/test-cases/apparmor-bluez-avrcp-volume.yaml
+++ b/test-cases/apparmor-bluez-avrcp-volume.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/apparmor-bluez-setup.yaml b/test-cases/apparmor-bluez-setup.yaml
index f0569104..07292bd3 100644
--- a/test-cases/apparmor-bluez-setup.yaml
+++ b/test-cases/apparmor-bluez-setup.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-bluez-setup
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/apparmor-bluez.yaml b/test-cases/apparmor-bluez.yaml
index f0aa3ea2..d8100358 100644
--- a/test-cases/apparmor-bluez.yaml
+++ b/test-cases/apparmor-bluez.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-bluez
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/apparmor-chaiwala-system.yaml b/test-cases/apparmor-chaiwala-system.yaml
index fb96a121..8646001a 100644
--- a/test-cases/apparmor-chaiwala-system.yaml
+++ b/test-cases/apparmor-chaiwala-system.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-chaiwala-system
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-dbus.yaml b/test-cases/apparmor-dbus.yaml
index b5457acb..cde628c6 100644
--- a/test-cases/apparmor-dbus.yaml
+++ b/test-cases/apparmor-dbus.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-dbus
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-folks.yaml b/test-cases/apparmor-folks.yaml
index 3d9a3881..db7ed43d 100644
--- a/test-cases/apparmor-folks.yaml
+++ b/test-cases/apparmor-folks.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-folks
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-functional-demo.yaml b/test-cases/apparmor-functional-demo.yaml
index 38f36260..be766637 100644
--- a/test-cases/apparmor-functional-demo.yaml
+++ b/test-cases/apparmor-functional-demo.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-functional-demo
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-geoclue.yaml b/test-cases/apparmor-geoclue.yaml
index 8ec588fa..7994e807 100644
--- a/test-cases/apparmor-geoclue.yaml
+++ b/test-cases/apparmor-geoclue.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-geoclue
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-gstreamer1-0.yaml b/test-cases/apparmor-gstreamer1-0.yaml
index b6340c48..b9e071b6 100644
--- a/test-cases/apparmor-gstreamer1-0.yaml
+++ b/test-cases/apparmor-gstreamer1-0.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-gstreamer1.0
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-ofono.yaml b/test-cases/apparmor-ofono.yaml
index 7252ab82..a3b2058d 100644
--- a/test-cases/apparmor-ofono.yaml
+++ b/test-cases/apparmor-ofono.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-ofono
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/apparmor-pulseaudio.yaml b/test-cases/apparmor-pulseaudio.yaml
index 1733d439..9ca61e31 100644
--- a/test-cases/apparmor-pulseaudio.yaml
+++ b/test-cases/apparmor-pulseaudio.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-pulseaudio
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-session-lockdown-no-deny.yaml b/test-cases/apparmor-session-lockdown-no-deny.yaml
index 80bfc9fe..56412f94 100644
--- a/test-cases/apparmor-session-lockdown-no-deny.yaml
+++ b/test-cases/apparmor-session-lockdown-no-deny.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-session-lockdown-no-deny
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index 01c5191e..da57d30d 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-tracker
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-tumbler.yaml b/test-cases/apparmor-tumbler.yaml
index d23cc86d..5c097c90 100644
--- a/test-cases/apparmor-tumbler.yaml
+++ b/test-cases/apparmor-tumbler.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-tumbler
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor-utils.yaml b/test-cases/apparmor-utils.yaml
index 646f7dbf..5e035a08 100644
--- a/test-cases/apparmor-utils.yaml
+++ b/test-cases/apparmor-utils.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor-utils
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/apparmor.yaml b/test-cases/apparmor.yaml
index 1cc9f4db..d6c9f1b7 100644
--- a/test-cases/apparmor.yaml
+++ b/test-cases/apparmor.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: apparmor
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/bluez-avrcp-volume.yaml b/test-cases/bluez-avrcp-volume.yaml
index 8c8e31d3..8ae601cf 100644
--- a/test-cases/bluez-avrcp-volume.yaml
+++ b/test-cases/bluez-avrcp-volume.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: bluez-avrcp-volume
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/bluez-hfp.yaml b/test-cases/bluez-hfp.yaml
index ae11b26c..d2e05097 100644
--- a/test-cases/bluez-hfp.yaml
+++ b/test-cases/bluez-hfp.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: bluez-hfp
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/bluez-phone.yaml b/test-cases/bluez-phone.yaml
index 8087b877..231a2ccb 100644
--- a/test-cases/bluez-phone.yaml
+++ b/test-cases/bluez-phone.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: bluez-phone
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/bluez-setup.yaml b/test-cases/bluez-setup.yaml
index 48031df1..6d15b878 100644
--- a/test-cases/bluez-setup.yaml
+++ b/test-cases/bluez-setup.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: bluez-setup
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/boot-no-crashes.yaml b/test-cases/boot-no-crashes.yaml
index fa2568cd..09404a72 100644
--- a/test-cases/boot-no-crashes.yaml
+++ b/test-cases/boot-no-crashes.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: boot-no-crashes
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/boot-performance.yaml b/test-cases/boot-performance.yaml
index 016b4b44..1bb652eb 100644
--- a/test-cases/boot-performance.yaml
+++ b/test-cases/boot-performance.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: boot-performance
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: performance
   exec-type: automated
diff --git a/test-cases/canterbury.yaml b/test-cases/canterbury.yaml
index d2a092ab..15f947ee 100644
--- a/test-cases/canterbury.yaml
+++ b/test-cases/canterbury.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: canterbury
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/cgroups-resource-control.yaml b/test-cases/cgroups-resource-control.yaml
index d15ad138..c5d4ce26 100644
--- a/test-cases/cgroups-resource-control.yaml
+++ b/test-cases/cgroups-resource-control.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: cgroups-resource-control
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/check-dbus-services.yaml b/test-cases/check-dbus-services.yaml
index e54c680d..1b63dbbb 100644
--- a/test-cases/check-dbus-services.yaml
+++ b/test-cases/check-dbus-services.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: check-dbus-services
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: sanity
   exec-type: automated
diff --git a/test-cases/check-tiny-system-container.yaml b/test-cases/check-tiny-system-container.yaml
index 693b3a90..cb55c4c5 100644
--- a/test-cases/check-tiny-system-container.yaml
+++ b/test-cases/check-tiny-system-container.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: check-tiny-system-container
   format: "Apertis Test Definition 1.0"
-  image-type: tiny-lxc
+  image-variant: tiny-lxc
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/check-tiny-user-container.yaml b/test-cases/check-tiny-user-container.yaml
index b2b588e0..502631f8 100644
--- a/test-cases/check-tiny-user-container.yaml
+++ b/test-cases/check-tiny-user-container.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: check-tiny-user-container
   format: "Apertis Test Definition 1.0"
-  image-type: tiny-lxc
+  image-variant: tiny-lxc
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/connman-new-supplicant.yaml b/test-cases/connman-new-supplicant.yaml
index ae222e97..81678e21 100644
--- a/test-cases/connman-new-supplicant.yaml
+++ b/test-cases/connman-new-supplicant.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: connman-new-supplicant
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/connman-pan-network-access.yaml b/test-cases/connman-pan-network-access.yaml
index bc70f0e4..bc6ce205 100644
--- a/test-cases/connman-pan-network-access.yaml
+++ b/test-cases/connman-pan-network-access.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: connman-pan-network-access
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/connman-pan-tethering.yaml b/test-cases/connman-pan-tethering.yaml
index b49945f2..e8986322 100644
--- a/test-cases/connman-pan-tethering.yaml
+++ b/test-cases/connman-pan-tethering.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: connman-pan-tethering
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/connman-services.yaml b/test-cases/connman-services.yaml
index 48f3ba2d..8f9a1798 100644
--- a/test-cases/connman-services.yaml
+++ b/test-cases/connman-services.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: connman-services
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/connman-usb-tethering.yaml b/test-cases/connman-usb-tethering.yaml
index e2fd5758..12b02661 100644
--- a/test-cases/connman-usb-tethering.yaml
+++ b/test-cases/connman-usb-tethering.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: connman-usb-tethering
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/connman.yaml b/test-cases/connman.yaml
index 6917e227..94ac148c 100644
--- a/test-cases/connman.yaml
+++ b/test-cases/connman.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: connman
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/dbus-dos-reply-time.yaml b/test-cases/dbus-dos-reply-time.yaml
index 6e87cbf1..0d09437e 100644
--- a/test-cases/dbus-dos-reply-time.yaml
+++ b/test-cases/dbus-dos-reply-time.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: dbus-dos-reply-time
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: performance
   exec-type: automated
diff --git a/test-cases/dbus-installed-tests.yaml b/test-cases/dbus-installed-tests.yaml
index fa8ce8b4..8309e22b 100644
--- a/test-cases/dbus-installed-tests.yaml
+++ b/test-cases/dbus-installed-tests.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: dbus-installed-tests
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/didcot.yaml b/test-cases/didcot.yaml
index fcc7ea8e..f6b9bff4 100644
--- a/test-cases/didcot.yaml
+++ b/test-cases/didcot.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: didcot-service
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/eclipse-plugins-install-target.yaml b/test-cases/eclipse-plugins-install-target.yaml
index 00dfd4bd..711130e2 100644
--- a/test-cases/eclipse-plugins-install-target.yaml
+++ b/test-cases/eclipse-plugins-install-target.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: eclipse-plugins-install-target
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: manual
diff --git a/test-cases/eclipse-plugins-remote-debugging.yaml b/test-cases/eclipse-plugins-remote-debugging.yaml
index 8d985713..94009b2f 100644
--- a/test-cases/eclipse-plugins-remote-debugging.yaml
+++ b/test-cases/eclipse-plugins-remote-debugging.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: eclipse-plugins-remote-debugging
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: manual
diff --git a/test-cases/eclipse-sysroot-management.yaml b/test-cases/eclipse-sysroot-management.yaml
index 72c2d8f2..84701d36 100644
--- a/test-cases/eclipse-sysroot-management.yaml
+++ b/test-cases/eclipse-sysroot-management.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: eclipse-sysroot-management
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: manual
diff --git a/test-cases/evolution-sync-bluetooth.yaml b/test-cases/evolution-sync-bluetooth.yaml
index 3da92c2e..30289940 100644
--- a/test-cases/evolution-sync-bluetooth.yaml
+++ b/test-cases/evolution-sync-bluetooth.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: evolution-sync-bluetooth
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/folks-alias-persistence.yaml b/test-cases/folks-alias-persistence.yaml
index 288a2686..61cb33bd 100644
--- a/test-cases/folks-alias-persistence.yaml
+++ b/test-cases/folks-alias-persistence.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-alias-persistence
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/folks-eds-compatibility.yaml b/test-cases/folks-eds-compatibility.yaml
index 998bc450..3f72f589 100644
--- a/test-cases/folks-eds-compatibility.yaml
+++ b/test-cases/folks-eds-compatibility.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-eds-compatibility
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: compatibility
   exec-type: automated
diff --git a/test-cases/folks-extended-info.yaml b/test-cases/folks-extended-info.yaml
index d4692875..3b1c33ec 100644
--- a/test-cases/folks-extended-info.yaml
+++ b/test-cases/folks-extended-info.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-extended-info
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/folks-metacontacts-antilinking.yaml b/test-cases/folks-metacontacts-antilinking.yaml
index 9146adc5..11bc8a23 100644
--- a/test-cases/folks-metacontacts-antilinking.yaml
+++ b/test-cases/folks-metacontacts-antilinking.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-metacontacts-antilinking
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/folks-metacontacts-linking.yaml b/test-cases/folks-metacontacts-linking.yaml
index 98677d52..485cba50 100644
--- a/test-cases/folks-metacontacts-linking.yaml
+++ b/test-cases/folks-metacontacts-linking.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-metacontacts-linking
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/folks-metacontacts-unlinking.yaml b/test-cases/folks-metacontacts-unlinking.yaml
index f44467b8..af3da861 100644
--- a/test-cases/folks-metacontacts-unlinking.yaml
+++ b/test-cases/folks-metacontacts-unlinking.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-metacontacts-unlinking
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/folks-ofono-backend.yaml b/test-cases/folks-ofono-backend.yaml
index fcc2b1a6..9730fabe 100644
--- a/test-cases/folks-ofono-backend.yaml
+++ b/test-cases/folks-ofono-backend.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-ofono-backend
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/folks-search-contacts.yaml b/test-cases/folks-search-contacts.yaml
index fe4c5760..0cab14b8 100644
--- a/test-cases/folks-search-contacts.yaml
+++ b/test-cases/folks-search-contacts.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-search-contacts
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/folks-sync-only.yaml b/test-cases/folks-sync-only.yaml
index 3d4d25ef..57f69df7 100644
--- a/test-cases/folks-sync-only.yaml
+++ b/test-cases/folks-sync-only.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: folks-sync-only
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: unit
   exec-type: automated
diff --git a/test-cases/frome.yaml b/test-cases/frome.yaml
index 497b8c8d..f03d410b 100644
--- a/test-cases/frome.yaml
+++ b/test-cases/frome.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: frome
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/gettext-i18n.yaml b/test-cases/gettext-i18n.yaml
index 59c87d95..6306e2ef 100644
--- a/test-cases/gettext-i18n.yaml
+++ b/test-cases/gettext-i18n.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: gettext-i18n
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/glib-gio-fs.yaml b/test-cases/glib-gio-fs.yaml
index a7ba45b3..6f74d841 100644
--- a/test-cases/glib-gio-fs.yaml
+++ b/test-cases/glib-gio-fs.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: glib-gio-fs
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/grilo.yaml b/test-cases/grilo.yaml
index 255a2aba..e9d0dafc 100644
--- a/test-cases/grilo.yaml
+++ b/test-cases/grilo.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: grilo
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/gstreamer1-0-decode.yaml b/test-cases/gstreamer1-0-decode.yaml
index 8f570938..2fe349dd 100644
--- a/test-cases/gstreamer1-0-decode.yaml
+++ b/test-cases/gstreamer1-0-decode.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: gstreamer1.0-decode
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/gupnp-services.yaml b/test-cases/gupnp-services.yaml
index bbdd5066..91fcdd34 100644
--- a/test-cases/gupnp-services.yaml
+++ b/test-cases/gupnp-services.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: gupnp-services
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/image-bootable.yaml b/test-cases/image-bootable.yaml
index c53f3265..85215ef8 100644
--- a/test-cases/image-bootable.yaml
+++ b/test-cases/image-bootable.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: image-bootable
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/image-gui-start.yaml b/test-cases/image-gui-start.yaml
index 2fd67815..68757603 100644
--- a/test-cases/image-gui-start.yaml
+++ b/test-cases/image-gui-start.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: image-gui-start
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/iptables-basic.yaml b/test-cases/iptables-basic.yaml
index ef1ed755..5e43d6f9 100644
--- a/test-cases/iptables-basic.yaml
+++ b/test-cases/iptables-basic.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: iptables-basic
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/iptables-nmap.yaml b/test-cases/iptables-nmap.yaml
index 647a548c..b3fdbf60 100644
--- a/test-cases/iptables-nmap.yaml
+++ b/test-cases/iptables-nmap.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: iptables-nmap
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/libsoup-unit.yaml b/test-cases/libsoup-unit.yaml
index a5b9e238..3e801d86 100644
--- a/test-cases/libsoup-unit.yaml
+++ b/test-cases/libsoup-unit.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: libsoup-unit
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/newport.yaml b/test-cases/newport.yaml
index d63813c2..0f071086 100644
--- a/test-cases/newport.yaml
+++ b/test-cases/newport.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: newport
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/ofono-sms-receive.yaml b/test-cases/ofono-sms-receive.yaml
index 57b5c52f..692bd96a 100644
--- a/test-cases/ofono-sms-receive.yaml
+++ b/test-cases/ofono-sms-receive.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: ofono-sms-receive
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/ofono-sms-send.yaml b/test-cases/ofono-sms-send.yaml
index 5a23df85..537ee777 100644
--- a/test-cases/ofono-sms-send.yaml
+++ b/test-cases/ofono-sms-send.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: ofono-sms-send
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/polkit-parsing.yaml b/test-cases/polkit-parsing.yaml
index 83c6adda..46abf8e5 100644
--- a/test-cases/polkit-parsing.yaml
+++ b/test-cases/polkit-parsing.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: polkit-parsing
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/rfkill-toggle.yaml b/test-cases/rfkill-toggle.yaml
index 9b8a1510..911fb2af 100644
--- a/test-cases/rfkill-toggle.yaml
+++ b/test-cases/rfkill-toggle.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: rfkill-toggle
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/rhosydd.yaml b/test-cases/rhosydd.yaml
index f56c3822..7b8753e5 100644
--- a/test-cases/rhosydd.yaml
+++ b/test-cases/rhosydd.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: rhosydd
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/ribchester.yaml b/test-cases/ribchester.yaml
index c93293c3..50d98c7a 100644
--- a/test-cases/ribchester.yaml
+++ b/test-cases/ribchester.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: ribchester
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/sanity-check.yaml b/test-cases/sanity-check.yaml
index 04decbee..2ee2fec6 100644
--- a/test-cases/sanity-check.yaml
+++ b/test-cases/sanity-check.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sanity-check
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: sanity
   exec-type: all
diff --git a/test-cases/sdk-ade-remote-debugging.yaml b/test-cases/sdk-ade-remote-debugging.yaml
index 9f1fc9f3..b8b24806 100644
--- a/test-cases/sdk-ade-remote-debugging.yaml
+++ b/test-cases/sdk-ade-remote-debugging.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-ade-remote-debugging
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: manual
diff --git a/test-cases/sdk-code-analysis-tools-gcov.yaml b/test-cases/sdk-code-analysis-tools-gcov.yaml
index 87779924..554a758c 100644
--- a/test-cases/sdk-code-analysis-tools-gcov.yaml
+++ b/test-cases/sdk-code-analysis-tools-gcov.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-code-analysis-tools-gcov
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-code-analysis-tools-splint.yaml b/test-cases/sdk-code-analysis-tools-splint.yaml
index 6a2ec489..edeb3180 100644
--- a/test-cases/sdk-code-analysis-tools-splint.yaml
+++ b/test-cases/sdk-code-analysis-tools-splint.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-code-analysis-tools-splint
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-cross-compilation.yaml b/test-cases/sdk-cross-compilation.yaml
index 7a310aca..015abc28 100644
--- a/test-cases/sdk-cross-compilation.yaml
+++ b/test-cases/sdk-cross-compilation.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-cross-compilation
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-dbus-tools-bustle.yaml b/test-cases/sdk-dbus-tools-bustle.yaml
index 64ad49d4..b93f81fc 100644
--- a/test-cases/sdk-dbus-tools-bustle.yaml
+++ b/test-cases/sdk-dbus-tools-bustle.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-dbus-tools-bustle
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: performance
   exec-type: manual
diff --git a/test-cases/sdk-dbus-tools-d-feet.yaml b/test-cases/sdk-dbus-tools-d-feet.yaml
index c4fbce5d..0c285d60 100644
--- a/test-cases/sdk-dbus-tools-d-feet.yaml
+++ b/test-cases/sdk-dbus-tools-d-feet.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-dbus-tools-d-feet
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: performance
   exec-type: manual
diff --git a/test-cases/sdk-debug-tools-gdb.yaml b/test-cases/sdk-debug-tools-gdb.yaml
index b3392f81..11d59177 100644
--- a/test-cases/sdk-debug-tools-gdb.yaml
+++ b/test-cases/sdk-debug-tools-gdb.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-debug-tools-gdb
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-debug-tools-strace.yaml b/test-cases/sdk-debug-tools-strace.yaml
index 4ab760b1..aa3311de 100644
--- a/test-cases/sdk-debug-tools-strace.yaml
+++ b/test-cases/sdk-debug-tools-strace.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-debug-tools-strace
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-debug-tools-valgrind.yaml b/test-cases/sdk-debug-tools-valgrind.yaml
index 00e29536..cb9d07b3 100644
--- a/test-cases/sdk-debug-tools-valgrind.yaml
+++ b/test-cases/sdk-debug-tools-valgrind.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-debug-tools-valgrind
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-ide-build-run-program.yaml b/test-cases/sdk-ide-build-run-program.yaml
index 42c73027..c55c91f6 100644
--- a/test-cases/sdk-ide-build-run-program.yaml
+++ b/test-cases/sdk-ide-build-run-program.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-ide-build-run-program
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: manual
diff --git a/test-cases/sdk-performance-tools-gprof.yaml b/test-cases/sdk-performance-tools-gprof.yaml
index 64624c83..b405c42e 100644
--- a/test-cases/sdk-performance-tools-gprof.yaml
+++ b/test-cases/sdk-performance-tools-gprof.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-performance-tools-gprof
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-performance-tools-sysprof.yaml b/test-cases/sdk-performance-tools-sysprof.yaml
index 02a68897..5add7e7b 100644
--- a/test-cases/sdk-performance-tools-sysprof.yaml
+++ b/test-cases/sdk-performance-tools-sysprof.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-performance-tools-sysprof
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/sdk-vb-fullscreen.yaml b/test-cases/sdk-vb-fullscreen.yaml
index 70cf17fc..183c7eda 100644
--- a/test-cases/sdk-vb-fullscreen.yaml
+++ b/test-cases/sdk-vb-fullscreen.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: sdk-vb-fullscreen
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: compatibility
   exec-type: manual
diff --git a/test-cases/telepathy-ring-automated.yaml b/test-cases/telepathy-ring-automated.yaml
index 81731299..53de5b32 100644
--- a/test-cases/telepathy-ring-automated.yaml
+++ b/test-cases/telepathy-ring-automated.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: telepathy-ring-automated
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: automated
diff --git a/test-cases/telepathy-ring.yaml b/test-cases/telepathy-ring.yaml
index e076d36b..abe0429d 100644
--- a/test-cases/telepathy-ring.yaml
+++ b/test-cases/telepathy-ring.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: telepathy-ring
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/tracker-indexing-local-storage.yaml b/test-cases/tracker-indexing-local-storage.yaml
index 734c451d..7e422e70 100644
--- a/test-cases/tracker-indexing-local-storage.yaml
+++ b/test-cases/tracker-indexing-local-storage.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: tracker-indexing-local-storage
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/tracker-indexing-mass-storage.yaml b/test-cases/tracker-indexing-mass-storage.yaml
index 6ce71c54..983a36c2 100644
--- a/test-cases/tracker-indexing-mass-storage.yaml
+++ b/test-cases/tracker-indexing-mass-storage.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: tracker-indexing-mass-storage
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/traffic-control-basic.yaml b/test-cases/traffic-control-basic.yaml
index dc32accf..9568277c 100644
--- a/test-cases/traffic-control-basic.yaml
+++ b/test-cases/traffic-control-basic.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: traffic-control-basic
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/traprain.yaml b/test-cases/traprain.yaml
index 261d2f0b..f3f2b6d4 100644
--- a/test-cases/traprain.yaml
+++ b/test-cases/traprain.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: traprain
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: unit
   exec-type: automated
diff --git a/test-cases/tumbler-thumbnailing.yaml b/test-cases/tumbler-thumbnailing.yaml
index c3cd98ea..b4be3188 100644
--- a/test-cases/tumbler-thumbnailing.yaml
+++ b/test-cases/tumbler-thumbnailing.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: tumbler-thumbnailing
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: automated
diff --git a/test-cases/video-animation-on-boot.yaml b/test-cases/video-animation-on-boot.yaml
index 6e2e47fb..b1c3ca06 100644
--- a/test-cases/video-animation-on-boot.yaml
+++ b/test-cases/video-animation-on-boot.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: video-animation-on-boot
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-ac-3d-rendering.yaml b/test-cases/webkit2gtk-ac-3d-rendering.yaml
index 017d209c..e6097445 100644
--- a/test-cases/webkit2gtk-ac-3d-rendering.yaml
+++ b/test-cases/webkit2gtk-ac-3d-rendering.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-ac-3d-rendering
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-ac-animations.yaml b/test-cases/webkit2gtk-ac-animations.yaml
index 75925a91..bef437a5 100644
--- a/test-cases/webkit2gtk-ac-animations.yaml
+++ b/test-cases/webkit2gtk-ac-animations.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-ac-animations
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-ac-scrolling.yaml b/test-cases/webkit2gtk-ac-scrolling.yaml
index 0bf28944..4f2716ae 100644
--- a/test-cases/webkit2gtk-ac-scrolling.yaml
+++ b/test-cases/webkit2gtk-ac-scrolling.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-ac-scrolling
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-actor-tiles.yaml b/test-cases/webkit2gtk-actor-tiles.yaml
index ef73d205..01d886ab 100644
--- a/test-cases/webkit2gtk-actor-tiles.yaml
+++ b/test-cases/webkit2gtk-actor-tiles.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-actor-tiles
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-aligned-scroll.yaml b/test-cases/webkit2gtk-aligned-scroll.yaml
index d31a8f2e..fd27a29d 100644
--- a/test-cases/webkit2gtk-aligned-scroll.yaml
+++ b/test-cases/webkit2gtk-aligned-scroll.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-aligned-scroll
   format: "Apertis Test Definition 1.0"
-  image-type: target
+  image-variant: target
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-contextual-zoom.yaml b/test-cases/webkit2gtk-contextual-zoom.yaml
index 9e0106cc..6682b26d 100644
--- a/test-cases/webkit2gtk-contextual-zoom.yaml
+++ b/test-cases/webkit2gtk-contextual-zoom.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-contextual-zoom
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-drag-and-drop.yaml b/test-cases/webkit2gtk-drag-and-drop.yaml
index fce183fc..046f85d7 100644
--- a/test-cases/webkit2gtk-drag-and-drop.yaml
+++ b/test-cases/webkit2gtk-drag-and-drop.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-drag-and-drop
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-event-handling-redesign.yaml b/test-cases/webkit2gtk-event-handling-redesign.yaml
index d4deb9db..0fa37094 100644
--- a/test-cases/webkit2gtk-event-handling-redesign.yaml
+++ b/test-cases/webkit2gtk-event-handling-redesign.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-event-handling-redesign
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-gstreamer1.0.yaml b/test-cases/webkit2gtk-gstreamer1.0.yaml
index 0ff8aa1c..a7367d97 100644
--- a/test-cases/webkit2gtk-gstreamer1.0.yaml
+++ b/test-cases/webkit2gtk-gstreamer1.0.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-gstreamer1.0
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-lazy-click.yaml b/test-cases/webkit2gtk-lazy-click.yaml
index 5f6a5f5e..6e3c996f 100644
--- a/test-cases/webkit2gtk-lazy-click.yaml
+++ b/test-cases/webkit2gtk-lazy-click.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-lazy-click
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/webkit2gtk-mt-touch-events.yaml b/test-cases/webkit2gtk-mt-touch-events.yaml
index 601cc750..a7a7479f 100644
--- a/test-cases/webkit2gtk-mt-touch-events.yaml
+++ b/test-cases/webkit2gtk-mt-touch-events.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: webkit2gtk-mt-touch-events
   format: "Apertis Test Definition 1.0"
-  image-type: any
+  image-variant: any
   image-arch: any
   type: functional
   exec-type: manual
diff --git a/test-cases/x-hw-accelerated.yaml b/test-cases/x-hw-accelerated.yaml
index 2212c419..56e95e54 100644
--- a/test-cases/x-hw-accelerated.yaml
+++ b/test-cases/x-hw-accelerated.yaml
@@ -1,7 +1,7 @@
 metadata:
   name: x-hw-accelerated
   format: "Apertis Test Definition 1.0"
-  image-type: SDK
+  image-variant: SDK
   image-arch: amd64
   type: functional
   exec-type: manual
-- 
GitLab