From a23607656f90755598ee675140da4d2c19d6c960 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 3 Apr 2023 17:03:44 +0200
Subject: [PATCH] RHEL-314 - Enable fmf tests in centos stream

Resolves: RHEL-314
---
 .fmf/version             |  1 +
 ci.fmf                   |  1 +
 cups.spec                |  3 +++
 gating.yaml              | 28 ++++++++++++++++++++++++----
 plans/public.fmf         |  6 ++++++
 plans/tier1-internal.fmf | 12 ++++++++++++
 6 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 ci.fmf
 create mode 100644 plans/public.fmf
 create mode 100644 plans/tier1-internal.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
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/cups.spec b/cups.spec
index 7dc5b2b..b92b39d 100644
--- a/cups.spec
+++ b/cups.spec
@@ -760,6 +760,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man7/ippeveps.7.gz
 
 %changelog
+* Mon Apr 03 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-17
+- RHEL-314 - Enable fmf tests in centos stream
+
 * Thu Mar 23 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-17
 - RHEL-317 - upstream test suite fails due uncorrect number of expected warnings
 
diff --git a/gating.yaml b/gating.yaml
index e979862..daad873 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,8 +1,28 @@
 --- !Policy
 product_versions:
-    - rhel-9
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
+
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/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: baseos-ci.brew-build.tedude.validation}
-    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.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/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..c745bce
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,6 @@
+summary: Test plan that runs all tests from cups tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/cups.git
+execute:
+    how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..6a8d9e1
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,12 @@
+summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/cups
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+    because: They don't have access to internal repos.