Update plans and gating

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}

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
+

plans/public.fmf

@@ -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

plans/tier1-internal.fmf

@@ -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.