From 57464fffd4621920f6c106337f9e9a06da94ab59 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Thu, 7 Mar 2024 12:29:34 +0100
Subject: [PATCH] Reorganize test metadata and add s390x support for libomp

---
 tests/main.fmf        | 62 +++++++++++++++++++++++++++++++++++++++++++
 tests/sanity/main.fmf | 38 --------------------------
 2 files changed, 62 insertions(+), 38 deletions(-)
 create mode 100644 tests/main.fmf

diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..33e6d69
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,62 @@
+# Common configuration for all the tests in this repo
+# All the tmt tests under this directory inherit the settings from this file
+component:
+  - llvm-toolset
+  - libomp
+
+# Default QA contact. If more are relevant use 'contact+:' in each test metadata.
+contact:
+  - Jesus Checa Hidalgo <jcheca@redhat.com>
+
+# All tests are shell by default. If a specific test uses another framework
+# such as beakerlib, define "framework: beakerlib" in the test's main.fmf
+framework: shell
+
+# Always define "test" key and override in adjust or in each specific test
+# metadata if needed.
+test: ./test.sh
+
+# Commonly used keys are initialized to empty.
+require: []
+link: []
+tag: []
+
+adjust+:
+  - because: "libomp is not supported in s390x (llvm < 18)"
+    when: >
+      arch == s390x and distro < rhel-9, rhel-9.5, fedora-40, centos-stream-9
+    enabled: false
+
+  # Common requirements when LLVM is not SCL-ized
+  - require+:
+      - clang
+      - clang-libs
+      - libomp
+      - libomp-devel
+    when: collection is not defined
+
+  # Requirements for SCL-ized LLVM
+  # We need to override the test key to do the proper scl call
+  - test: scl enable llvm-toolset-13.0 -- ./test.sh
+    require+:
+      - llvm-toolset-13.0-clang
+      - llvm-toolset-13.0-clang-libs
+      - llvm-toolset-13.0-libomp
+      - llvm-toolset-13.0-libomp-devel
+    when: collection == llvm-toolset-13.0
+
+  - test: scl enable llvm-toolset-14.0 -- ./test.sh
+    require+:
+      - llvm-toolset-14.0-clang
+      - llvm-toolset-14.0-clang-libs
+      - llvm-toolset-14.0-libomp
+      - llvm-toolset-14.0-libomp-devel
+    when: collection == llvm-toolset-14.0
+
+  - test: scl enable llvm-toolset-15.0 -- ./test.sh
+    require+:
+      - llvm-toolset-15.0-clang
+      - llvm-toolset-15.0-clang-libs
+      - llvm-toolset-15.0-libomp
+      - llvm-toolset-15.0-libomp-devel
+    when: collection == llvm-toolset-15.0
diff --git a/tests/sanity/main.fmf b/tests/sanity/main.fmf
index e004b87..65a664c 100644
--- a/tests/sanity/main.fmf
+++ b/tests/sanity/main.fmf
@@ -1,43 +1,5 @@
 summary: libomp sanity test
-test: "$WITH_SCL ./test.sh"
-framework: shell
 tier: 1
-component:
-  - llvm-toolset
-  - libomp
 extra-summary: /tools/libomp/sanity
 extra-task: /tools/libomp/sanity
 extra-nitrate: TC#0614255
-
-adjust:
-  - because: "libomp is not supported in s390x"
-    when: arch == s390x
-    enabled: false
-
-  # Common requirements when LLVM is not SCL-ized
-  - require:
-      - clang
-      - clang-libs
-      - libomp
-      - libomp-devel
-    when: "collection is not defined"
-
-  # Requirements for SCL-ized LLVM
-  - require:
-      - llvm-toolset-13.0-clang
-      - llvm-toolset-13.0-clang-libs
-      - llvm-toolset-13.0-libomp
-      - llvm-toolset-13.0-libomp-devel
-    when: "collection == llvm-toolset-13.0"
-  - require:
-      - llvm-toolset-14.0-clang
-      - llvm-toolset-14.0-clang-libs
-      - llvm-toolset-14.0-libomp
-      - llvm-toolset-14.0-libomp-devel
-    when: "collection == llvm-toolset-14.0"
-  - require:
-      - llvm-toolset-15.0-clang
-      - llvm-toolset-15.0-clang-libs
-      - llvm-toolset-15.0-libomp
-      - llvm-toolset-15.0-libomp-devel
-    when: "collection == llvm-toolset-15.0"