From 0882c3392c87647c812b1fe41fa379fd19896960 Mon Sep 17 00:00:00 2001
From: pdancak <pdancak@redhat.com>
Date: Fri, 22 Nov 2024 12:39:04 +0100
Subject: [PATCH] fips update

---
 plans/fips.fmf        | 26 ++++++++++++++++++++++++++
 plans/tier1.fmf       | 12 ++++++------
 plans/tier2-tier3.fmf |  8 ++++----
 3 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 plans/fips.fmf

diff --git a/plans/fips.fmf b/plans/fips.fmf
new file mode 100644
index 0000000..1cca770
--- /dev/null
+++ b/plans/fips.fmf
@@ -0,0 +1,26 @@
+/internal:
+  summary: Internal Tier1 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 917ee27..3453bfb 100644
--- a/plans/tier1.fmf
+++ b/plans/tier1.fmf
@@ -3,15 +3,15 @@
   discover:
   - name: fedora
     how: fmf
-    filter: 'tier: 1'
+    filter: 'tier: 1 & tag: -fips'
     url: "https://src.fedoraproject.org/tests/libppd.git"
   - name: fedora-cups-filters
     how: fmf
-    filter: 'tier: 1'
+    filter: 'tier: 1 & tag: -fips'
     url: https://src.fedoraproject.org/tests/cups-filters.git
   - name: fedora-browsed
     how: fmf
-    filter: 'tier: 1'
+    filter: 'tier: 1 & tag: -fips'
     url: "https://src.fedoraproject.org/tests/cups-browsed.git"
   execute:
     how: tmt
@@ -21,15 +21,15 @@
   discover:
   - name: internal
     how: fmf
-    filter: 'tier: 1'
+    filter: 'tier: 1 & tag: -fips'
     url: git://pkgs.devel.redhat.com/tests/libppd
   - name: filters-internal
     how: fmf
-    filter: 'tier: 1'
+    filter: 'tier: 1 & tag: -fips'
     url: git://pkgs.devel.redhat.com/tests/cups-filters
   - name: browsed
     how: fmf
-    filter: 'tier: 1'
+    filter: 'tier: 1 & tag: -fips'
     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 6af1bd9..dead49c 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'
+    filter: '(tier: 2 | tier: 3) & tag: -fips'
     url: "https://src.fedoraproject.org/tests/libppd.git"
   - name: fedora-cups-filters
     how: fmf
-    filter: 'tier: 2 | tier: 3'
+    filter: '(tier: 2 | tier: 3) & tag: -fips'
     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'
+    filter: '(tier: 2 | tier: 3) & tag: -fips'
     url: git://pkgs.devel.redhat.com/tests/libppd
   - name: filters-internal
     how: fmf
-    filter: 'tier: 1'
+    filter: '(tier: 2 | tier: 3) & tag: -fips'
     url: git://pkgs.devel.redhat.com/tests/cups-filters
   adjust:
     enabled: false