From bdce3988c7ff3d4af56c0cb9dc8f6175b8e03860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= <vkadlcik@redhat.com>
Date: Mon, 15 Sep 2025 15:19:42 +0200
Subject: [PATCH] Align tier0 with other toolchain components

---
 plans/ci.fmf                          |  6 ---
 plans/tier0.fmf                       | 22 ++++++++++
 tests/Regression/testsuite/main.fmf   | 17 --------
 tests/Regression/testsuite/runtest.sh | 59 ---------------------------
 4 files changed, 22 insertions(+), 82 deletions(-)
 delete mode 100644 plans/ci.fmf
 create mode 100644 plans/tier0.fmf
 delete mode 100644 tests/Regression/testsuite/main.fmf
 delete mode 100755 tests/Regression/testsuite/runtest.sh

diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 1ad2c12..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-    directory: tests
-execute:
-    how: beakerlib
diff --git a/plans/tier0.fmf b/plans/tier0.fmf
new file mode 100644
index 0000000..01f88e7
--- /dev/null
+++ b/plans/tier0.fmf
@@ -0,0 +1,22 @@
+# Tier 0 test plan. It's actually Tier 1
+#   - limited to its public part
+#   - executed on the architecture at hand
+# When run by osci.tier0 on CentOS Stream or RHEL, it receives the following
+# context:
+#   arch=x86_64 (the architecture at hand, currently OSCI uses just x86_64)
+#   distro=rhel<M>.<m> (even for CentOS Stream builds)
+#   trigger=build
+
+summary: Tier 0 test plan
+discover:
+  - name: collect_info
+    how: shell
+    tests:
+      - name: /info/rpms
+        test: rpm -qa --last
+  - name: public_tests
+    how: fmf
+    url: https://gitlab.com/redhat/centos-stream/tests/yasm.git
+    filter: tier:1
+execute:
+  how: tmt
diff --git a/tests/Regression/testsuite/main.fmf b/tests/Regression/testsuite/main.fmf
deleted file mode 100644
index 1f4b56c..0000000
--- a/tests/Regression/testsuite/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: testsuite
-description: ''
-contact: Martin Cermak <mcermak@redhat.com>
-component:
-- yasm
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- yasm
-- bison
-- byacc
-- gettext-devel
-- xmlto
-- rpm-build
-duration: 48h
-extra-summary: /tools/yasm/Regression/testsuite
-extra-task: /tools/yasm/Regression/testsuite
diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh
deleted file mode 100755
index 4c66f1f..0000000
--- a/tests/Regression/testsuite/runtest.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/yasm/Regression/testsuite
-#   Description: testsuite
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="yasm"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-       rlRun "TMP=\$(mktemp -d)"
-        rlRun "pushd $TMP"
-
-	rlFetchSrcForInstalled $PACKAGE
-	rlRun "dnf builddep -y *src.rpm --nobest"
-	rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm"
-	rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/yasm.spec"
-	rlRun "pushd BUILD/yasm-*"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-	rlRun "make check |& tee test.log"
-	rlRun "PASS=$(awk '/# PASS:/ {print $3}' test.log)"
-	rlRun "FAIL=$(awk '/# FAIL:/ {print $3}' test.log)"
-	rlRun "test $PASS -ge 44"
-	rlRun "test $FAIL -eq 0"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd; popd"
-        rlRun "rm -r $TMP"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd