From ef27028bde3e1664ee1e381f95fe8c9ebf5fdcf8 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 6 Aug 2024 13:44:36 +0200
Subject: [PATCH] Update plans and gating

---
 gating.yaml              | 14 ++++++++------
 plans.fmf                | 36 ++++++++++++++++++++++++++++++++++++
 plans/public.fmf         | 13 -------------
 plans/tier1-internal.fmf | 20 --------------------
 4 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 plans.fmf
 delete mode 100644 plans/public.fmf
 delete mode 100644 plans/tier1-internal.fmf

diff --git a/gating.yaml b/gating.yaml
index 82fa572..71d105b 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,23 +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./plans/public.functional}
-#gating rawhide
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+
+#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./plans/public.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: osci.brew-build./plans/public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..00584fa
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/libppd.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/libppd.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/libppd.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/libppd.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/libppd.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/libppd.git
+      name: /plans/others/public
+
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index 94c654d..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,13 +0,0 @@
-summary: Test plan that runs all tests from libppd tests repo.
-discover:
-  - name: fedora-libppd
-    how: fmf
-    url: https://src.fedoraproject.org/tests/libppd.git 
-  - name: fedora-cups-browsed
-    how: fmf
-    url: https://src.fedoraproject.org/tests/cups-browsed.git
-  - name: fedora-cups-filters
-    how: fmf
-    url: https://src.fedoraproject.org/tests/cups-filters.git
-execute:
-    how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 7e1cef0..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,20 +0,0 @@
-summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel-libppd
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/libppd
-  - name: rhel-cups-browsed
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/cups-browsed
-  - name: rhel-cups-filters
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/cups-filters
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream, fedora
-    because: They don't have access to internal repos.