From 11d512640daa31f690f351a950ded5a3c7f23a33 Mon Sep 17 00:00:00 2001
From: "psklenar@redhat.com" <psklenar@redhat.com>
Date: Thu, 6 Jun 2024 12:34:21 +0200
Subject: [PATCH] c10 plans for CI

---
 gating.yaml              | 14 ++++++++------
 pcaudiolib.spec          |  5 ++++-
 plans.fmf                | 11 +++++++++++
 plans/public.fmf         |  6 ------
 plans/tier1-internal.fmf | 12 ------------
 5 files changed, 23 insertions(+), 25 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 cabc9d9..8085288 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -2,22 +2,24 @@
 product_versions:
   - fedora-*
 decision_context: bodhi_update_push_testing
-subject_type: koji_build	
+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}
+ 
 #Rawhide
 --- !Policy
 product_versions:
   - fedora-*
 decision_context: bodhi_update_push_stable
-subject_type: koji_build	
+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	
+decision_context: osci_compose_gate
 rules:
+  - !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/pcaudiolib.spec b/pcaudiolib.spec
index 72d8382..f897999 100644
--- a/pcaudiolib.spec
+++ b/pcaudiolib.spec
@@ -1,6 +1,6 @@
 Name:           pcaudiolib
 Version:        1.1
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Portable C Audio Library
 
 # pcaudiolib bundles TPCircularBuffer with Cube license, which is only used
@@ -51,6 +51,9 @@ rm -vf %{buildroot}%{_libdir}/*.{a,la}
 %{_includedir}/%{name}/audio.h
 
 %changelog
+* Thu Jun 06 2024 psklenar@redhat.com <psklenar@redhat.com> - 1.1-17
+- adding right fmf plan, ci.fmf with seperate, plan naming changed
+
 * Wed Jun 05 2024 Tomas Korbar <tkorbar@redhat.com> - 1.1-16
 - Bump release because of gating.yaml change
 
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..949cb42
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,11 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/espeak-ng.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/espeak-ng.git
+      name: /plans/tier1/public
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index 60373ad..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan that runs all Fedora tests from espeak-ng
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/espeak-ng.git
-execute:
-    how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 54a448f..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/espeak-ng
-execute:
-    how: tmt	
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
-    because: They don't have access to internal repos.