From d7b7537f37325800a47aa554524f4aeacbf60336 Mon Sep 17 00:00:00 2001
From: pdancak <pdancak@redhat.com>
Date: Mon, 25 Nov 2024 17:11:21 +0100
Subject: [PATCH] reverting changes to fips, using cups-filters/others

---
 plans/others.fmf      | 27 ---------------------------
 plans/tier1.fmf       | 12 ++++++------
 plans/tier2-tier3.fmf |  8 ++++----
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/plans/others.fmf b/plans/others.fmf
index 3d34b02..e161574 100644
--- a/plans/others.fmf
+++ b/plans/others.fmf
@@ -18,30 +18,3 @@
     when: distro == centos-stream or distro == fedora
   execute:
     how: tmt
-
-/fips:
-  summary: Internal fips tests
-  context+:
-    fips: enabled
-  discover:
-  - name: distribution
-    how: fmf
-    url: https://pkgs.devel.redhat.com/git/tests/distribution
-    test: /fips/setup-fips-enabled
-  - name: internal
-    how: fmf
-    filter: 'tag: fips'
-    url: git://pkgs.devel.redhat.com/tests/libppd
-  - name: filters-internal
-    how: fmf
-    filter: 'tag: fips'
-    url: git://pkgs.devel.redhat.com/tests/cups-filters
-  - name: browsed
-    how: fmf
-    filter: 'tag: fips'
-    url: git://pkgs.devel.redhat.com/tests/cups-browsed
-  adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
-  execute:
-    how: tmt
diff --git a/plans/tier1.fmf b/plans/tier1.fmf
index 3453bfb..917ee27 100644
--- a/plans/tier1.fmf
+++ b/plans/tier1.fmf
@@ -3,15 +3,15 @@
   discover:
   - name: fedora
     how: fmf
-    filter: 'tier: 1 & tag: -fips'
+    filter: 'tier: 1'
     url: "https://src.fedoraproject.org/tests/libppd.git"
   - name: fedora-cups-filters
     how: fmf
-    filter: 'tier: 1 & tag: -fips'
+    filter: 'tier: 1'
     url: https://src.fedoraproject.org/tests/cups-filters.git
   - name: fedora-browsed
     how: fmf
-    filter: 'tier: 1 & tag: -fips'
+    filter: 'tier: 1'
     url: "https://src.fedoraproject.org/tests/cups-browsed.git"
   execute:
     how: tmt
@@ -21,15 +21,15 @@
   discover:
   - name: internal
     how: fmf
-    filter: 'tier: 1 & tag: -fips'
+    filter: 'tier: 1'
     url: git://pkgs.devel.redhat.com/tests/libppd
   - name: filters-internal
     how: fmf
-    filter: 'tier: 1 & tag: -fips'
+    filter: 'tier: 1'
     url: git://pkgs.devel.redhat.com/tests/cups-filters
   - name: browsed
     how: fmf
-    filter: 'tier: 1 & tag: -fips'
+    filter: 'tier: 1'
     url: git://pkgs.devel.redhat.com/tests/cups-browsed
   adjust:
     enabled: false
diff --git a/plans/tier2-tier3.fmf b/plans/tier2-tier3.fmf
index dead49c..fe3f7e5 100644
--- a/plans/tier2-tier3.fmf
+++ b/plans/tier2-tier3.fmf
@@ -3,11 +3,11 @@
   discover:
   - name: fedora
     how: fmf
-    filter: '(tier: 2 | tier: 3) & tag: -fips'
+    filter: '(tier: 2 | tier: 3)'
     url: "https://src.fedoraproject.org/tests/libppd.git"
   - name: fedora-cups-filters
     how: fmf
-    filter: '(tier: 2 | tier: 3) & tag: -fips'
+    filter: '(tier: 2 | tier: 3)'
     url: https://src.fedoraproject.org/tests/cups-filters.git
   execute:
     how: tmt
@@ -17,11 +17,11 @@
   discover:
   - name: internal
     how: fmf
-    filter: '(tier: 2 | tier: 3) & tag: -fips'
+    filter: '(tier: 2 | tier: 3)'
     url: git://pkgs.devel.redhat.com/tests/libppd
   - name: filters-internal
     how: fmf
-    filter: '(tier: 2 | tier: 3) & tag: -fips'
+    filter: '(tier: 2 | tier: 3)'
     url: git://pkgs.devel.redhat.com/tests/cups-filters
   adjust:
     enabled: false