From cce3cc4dde75812eca6f78b730c5178742e53017 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Wed, 12 Feb 2025 12:46:33 +0100
Subject: [PATCH] Merge fedora and snapshot configs for integration-test-suite

Now that snapshots also include libcxx and mlir, we can use the
normal fedora configuration.

Also drop the conditions for fedora versions older than 40, which
are no longer supported.
---
 tests/integration-test-suite/fedora.fmf    | 21 +++-------------
 tests/integration-test-suite/snapshots.fmf | 28 ----------------------
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 tests/integration-test-suite/snapshots.fmf

diff --git a/tests/integration-test-suite/fedora.fmf b/tests/integration-test-suite/fedora.fmf
index dd97be6..abc8928 100644
--- a/tests/integration-test-suite/fedora.fmf
+++ b/tests/integration-test-suite/fedora.fmf
@@ -1,6 +1,5 @@
-# Fedora system repos package testing.
-# This setup is meant to be used with packages in system repos, not with
-# compat packages, or snapshots.
+# Fedora package testing.
+# This setup is meant to be used with non-compat packages.
 
 require+:
   - cmake
@@ -21,19 +20,5 @@ require+:
 
 adjust+:
   - enabled: false
-    when: distro != fedora or snapshot is defined or compat is defined
+    when: distro != fedora or compat is defined
     continue: false
-
-  # libomp and lld are supported in s390x for LLVM >= 18. Until tmt provides
-  # a way to provide custom contexts, we need to filter out by distro versions.
-  - require-:
-      - lld
-      - libomp-devel
-    when: arch == s390x and distro < fedora-40
-
-  # libunwind is not built for s390x in LLVM < 17
-  - require-:
-      - llvm-libunwind-devel
-    environment+:
-      NO_LIBUNWIND: true
-    when: arch == s390x and distro < fedora-39
diff --git a/tests/integration-test-suite/snapshots.fmf b/tests/integration-test-suite/snapshots.fmf
deleted file mode 100644
index 2758b87..0000000
--- a/tests/integration-test-suite/snapshots.fmf
+++ /dev/null
@@ -1,28 +0,0 @@
-# llvm-snapshots specific setup.
-# These are daily builds (latest upstream sources) of a reduced set of the llvm
-# components in currently supported Fedora releases.
-# Supported components can be checked in:
-# https://copr.fedorainfracloud.org/coprs/g/fedora-llvm-team/llvm-snapshots/monitor/
-
-require+:
-  - cmake
-  - clang
-  - clang-analyzer
-  - clang-devel
-  - clang-tools-extra
-  - compiler-rt
-  - lld
-  - lldb
-  - libomp-devel
-  - llvm-devel
-  - python3-lit
-
-environment+:
-  NO_LIBCXX: true
-  NO_STATIC_LIBCXX: true
-  NO_LIBUNWIND: true
-
-adjust+:
-  - enabled: false
-    when: snapshot is not defined or distro == rhel
-    continue: false