From 7d3508ea14a51246c6bab9221d42b7a23c78dc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= <fhrdina@redhat.com>
Date: Wed, 13 Aug 2025 09:34:29 +0200
Subject: [PATCH 1/2] Update of fmf plans

---
 ci.fmf        |  1 +
 gating.yaml   | 15 +++++++--------
 plans.fmf     | 35 +++++++++++++++++++++++++++++++++++
 plans/all.fmf |  6 ------
 4 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 ci.fmf
 create mode 100644 plans.fmf
 delete mode 100644 plans/all.fmf

diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 1773d0c..8085288 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,26 +1,25 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_testing]
+decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
  
-#gating rawhide
+#Rawhide
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_stable]
+decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
 #gating rhel
 --- !Policy
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..3615ed6
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,35 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
+      name: /plans/tier1/internal
+ 
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
+      name: /plans/tier1/public
+ 
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
+      name: /plans/tier2-tier3/internal
+ 
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
+      name: /plans/tier2-tier3/public
+ 
+/others-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
+      name: /plans/others/internal
+ 
+/others-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
+      name: /plans/others/public
\ No newline at end of file
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index 29b5c4f..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/cyrus-imapd.git
-execute:
-    how: tmt

From 84c6e100f7106bfdf4c5e2b7179ab083cedc196c Mon Sep 17 00:00:00 2001
From: Martin Osvald <mosvald@redhat.com>
Date: Mon, 24 Nov 2025 07:58:01 +0100
Subject: [PATCH 2/2] Remove sscg option --package from
 cyrus-imapd-init.service (rhbz#2416688)

Ref: https://sgallagh.wordpress.com/2025/10/23/sscg-4-0-0-release-announcement/
---
 cyrus-imapd-init.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cyrus-imapd-init.service b/cyrus-imapd-init.service
index 10823b7..3cecdea 100644
--- a/cyrus-imapd-init.service
+++ b/cyrus-imapd-init.service
@@ -9,4 +9,4 @@ ConditionPathExists=!/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
 Type=oneshot
 Group=mail
 RemainAfterExit=no
-ExecStart=/usr/bin/sscg --package cyrus-imapd --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem --cert-key-mode=0640 
+ExecStart=/usr/bin/sscg --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem --cert-key-mode=0640