From fa8bc5eb0b07cd00289cfc11a3a4a3d2f3a45610 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Fri, 1 Mar 2024 14:37:44 +0100
Subject: [PATCH] Update testplan to new metadata.

Remove unused cross packages script
Add integration testsuite to the plan
Add prepare steps needed in RHEL/CentOS
---
 build-gating.fmf        | 47 -------------------------------------
 plans/build-gating.fmf  | 51 +++++++++++++++++++++++++++++++++++++++++
 setup_cross_packages.sh |  7 ------
 3 files changed, 51 insertions(+), 54 deletions(-)
 delete mode 100644 build-gating.fmf
 create mode 100644 plans/build-gating.fmf
 delete mode 100755 setup_cross_packages.sh

diff --git a/build-gating.fmf b/build-gating.fmf
deleted file mode 100644
index 6a1894c..0000000
--- a/build-gating.fmf
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Build/PR gating tests for compiler-rt
-#
-# Compatible with various LLVM distributions:
-#
-#   * Fedora (ursine packages)
-#   * Centos 9 stream (ursine packages)
-#   * RHEL-9 (ursine packages)
-#   * RHEL-8 (Red Hat module)
-#   * RHEL-7 (software collection)
-#
-
-summary: compiler-rt tests for build/PR gating
-adjust:
-  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
-    when: >-
-      trigger is defined
-      and trigger != commit
-      and trigger != build
-    enabled: false
-
-  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
-    environment+:
-      WITH_SCL: "scl enable llvm-toolset-13.0"
-    when: "collection == llvm-toolset-13.0"
-  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
-    environment+:
-      WITH_SCL: "scl enable llvm-toolset-14.0"
-    when: "collection == llvm-toolset-14.0"
-  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
-    environment+:
-      WITH_SCL: "scl enable llvm-toolset-15.0"
-    when: "collection == llvm-toolset-15.0"
-
-discover:
-    - name: compiler-rt tests
-      how: fmf
-
-prepare:
-  - how: shell
-    script: sh ./setup_cross_packages.sh
-
-execute:
-    how: tmt
-provision:
-  hardware:
-    memory: ">= 4 GiB"
diff --git a/plans/build-gating.fmf b/plans/build-gating.fmf
new file mode 100644
index 0000000..456f328
--- /dev/null
+++ b/plans/build-gating.fmf
@@ -0,0 +1,51 @@
+#
+# Build/PR gating tests for compiler-rt
+#
+# Compatible with various LLVM distributions:
+#
+#   * Fedora (ursine packages)
+#   * Centos 9 stream (ursine packages)
+#   * RHEL-9 (ursine packages)
+#   * RHEL-8 (Red Hat module)
+#   * RHEL-7 (software collection)
+#
+
+summary: compiler-rt tests for build/PR gating
+adjust:
+  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
+    when: >-
+      trigger is defined
+      and trigger != commit
+      and trigger != build
+    enabled: false
+
+  - because: "On RHEL-8+, CRB must be enabled to provide rarer packages"
+    prepare+:
+      - name: Enable CRB
+        how: shell
+        script: dnf config-manager --set-enabled *-CRB
+    when: >-
+      distro == rhel and distro >= rhel-8
+
+  - because: "On CentOS, CRB must be enabled to provide rarer packages"
+    prepare+:
+      - name: Enable CRB
+        how: shell
+        script: dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled crb
+    when: >-
+      distro == centos
+
+discover:
+  - name: compiler-rt-tests
+    how: fmf
+  - name: upstream-llvm-integration-testsuite
+    how: fmf
+    url: https://src.fedoraproject.org/tests/llvm.git
+    ref: main
+    test: integration-test-suite
+
+execute:
+    how: tmt
+provision:
+  hardware:
+    memory: ">= 4 GiB"
diff --git a/setup_cross_packages.sh b/setup_cross_packages.sh
deleted file mode 100755
index 092abbe..0000000
--- a/setup_cross_packages.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-if [[ x"$KOJI_TASK_ID" != "x" ]]; then
-    dnf install -y koji
-    koji download-build --noprogress -a i686 --task-id $KOJI_TASK_ID
-    dnf install -y ./compiler-rt-*.i686.rpm
-fi