From 38f99c941053a0fab74610d701fc9b11f86a74c1 Mon Sep 17 00:00:00 2001
From: Eric Garver <egarver@redhat.com>
Date: Wed, 29 Jul 2026 15:38:19 -0400
Subject: [PATCH] ci: simplify test selection

We want to run ALL tests. If the test isn't reliable then it should be
fixed or removed.
---
 gating.yaml                                          |  6 +++---
 plans/{tier2-internal.fmf => downstream.fmf}         |  4 ++--
 plans/tier1-gating-heavy.fmf                         | 10 ----------
 plans/tier1-internal.fmf                             | 12 ------------
 plans/{tier1-gating.fmf => upstream-integration.fmf} |  4 ++--
 plans/{destructive.fmf => upstream.fmf}              |  4 ++--
 6 files changed, 9 insertions(+), 31 deletions(-)
 rename plans/{tier2-internal.fmf => downstream.fmf} (74%)
 delete mode 100644 plans/tier1-gating-heavy.fmf
 delete mode 100644 plans/tier1-internal.fmf
 rename plans/{tier1-gating.fmf => upstream-integration.fmf} (64%)
 rename plans/{destructive.fmf => upstream.fmf} (70%)

diff --git a/gating.yaml b/gating.yaml
index cf32df7..584423d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,6 +4,6 @@ product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-gating.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-gating-heavy.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/destructive.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/downstream.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/upstream.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/upstream-integration.functional}
diff --git a/plans/tier2-internal.fmf b/plans/downstream.fmf
similarity index 74%
rename from plans/tier2-internal.fmf
rename to plans/downstream.fmf
index 3e1d7d3..aa09552 100644
--- a/plans/tier2-internal.fmf
+++ b/plans/downstream.fmf
@@ -1,8 +1,8 @@
-summary: Internal Tier2 beakerlib tests
+summary: Downstream Tests
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tier: 2'
+    filter: 'tag: -upstream'
 execute:
     how: tmt
 adjust:
diff --git a/plans/tier1-gating-heavy.fmf b/plans/tier1-gating-heavy.fmf
deleted file mode 100644
index f4a4c21..0000000
--- a/plans/tier1-gating-heavy.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1-gating-heavy plan
-discover:
-    how: fmf
-    url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tag: CI-gating & tag: heavy & tag: -destructive'
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 76e3074..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: Internal Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tier: 1'
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream-9
-provision:
-    how: beaker
diff --git a/plans/tier1-gating.fmf b/plans/upstream-integration.fmf
similarity index 64%
rename from plans/tier1-gating.fmf
rename to plans/upstream-integration.fmf
index 566420e..b75bdcb 100644
--- a/plans/tier1-gating.fmf
+++ b/plans/upstream-integration.fmf
@@ -1,8 +1,8 @@
-summary: Internal Tier1-gating plan
+summary: Upstream Integration Testsuite
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tag: CI-gating & tag: -heavy & tag: -destructive'
+    filter: 'tag: upstream & tag: integration'
 execute:
     how: tmt
 adjust:
diff --git a/plans/destructive.fmf b/plans/upstream.fmf
similarity index 70%
rename from plans/destructive.fmf
rename to plans/upstream.fmf
index 1e4ce7b..97416e7 100644
--- a/plans/destructive.fmf
+++ b/plans/upstream.fmf
@@ -1,8 +1,8 @@
-summary: Internal Tier1 beakerlib tests
+summary: Upstream Testsuite
 discover:
     how: fmf
     url: git://pkgs.devel.redhat.com/tests/firewalld
-    filter: 'tag: destructive'
+    filter: 'tag: upstream & tag: -integration'
 execute:
     how: tmt
 adjust: