From e980c00e107d9ee0c16dbb17d816fde6a4b231ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= <fhrdina@redhat.com>
Date: Tue, 10 Oct 2023 11:59:53 +0200
Subject: [PATCH] Update of fmf plans

Change to using fmf plans
---
 gating.yaml                                   |  4 ++++
 plans/internal/Acceptance-internal.fmf        | 10 ++++++++++
 plans/internal/other-internal.fmf             | 10 ++++++++++
 plans/internal/tier1-internal.fmf             | 10 ++++++++++
 plans/internal/tier2-internal.fmf             | 10 ++++++++++
 plans/internal/tier3-internal.fmf             | 10 ++++++++++
 plans/public/Acceptance-public.fmf            |  7 +++++++
 plans/public/other-public.fmf                 |  7 +++++++
 plans/{public.fmf => public/tier1-public.fmf} |  4 ++--
 plans/public/tier2-public.fmf                 |  7 +++++++
 plans/public/tier3-public.fmf                 |  7 +++++++
 plans/tier1-internal.fmf                      | 15 ---------------
 12 files changed, 84 insertions(+), 17 deletions(-)
 create mode 100644 plans/internal/Acceptance-internal.fmf
 create mode 100644 plans/internal/other-internal.fmf
 create mode 100644 plans/internal/tier1-internal.fmf
 create mode 100644 plans/internal/tier2-internal.fmf
 create mode 100644 plans/internal/tier3-internal.fmf
 create mode 100644 plans/public/Acceptance-public.fmf
 create mode 100644 plans/public/other-public.fmf
 rename plans/{public.fmf => public/tier1-public.fmf} (63%)
 create mode 100644 plans/public/tier2-public.fmf
 create mode 100644 plans/public/tier3-public.fmf
 delete mode 100644 plans/tier1-internal.fmf

diff --git a/gating.yaml b/gating.yaml
index 7cd5018..56bbdae 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,4 +4,8 @@ product_versions:
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/Acceptance-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/Acceptance-public.functional}
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
diff --git a/plans/internal/Acceptance-internal.fmf b/plans/internal/Acceptance-internal.fmf
new file mode 100644
index 0000000..176a236
--- /dev/null
+++ b/plans/internal/Acceptance-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Acceptance tests plan
+discover:
+    how: fmf
+    filter: 'tag: Acceptance'
+    url: git://pkgs.devel.redhat.com/tests/frr
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/other-internal.fmf b/plans/internal/other-internal.fmf
new file mode 100644
index 0000000..d374ff1
--- /dev/null
+++ b/plans/internal/other-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Other tests plan
+discover:
+    how: fmf
+    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -Acceptance & tag: -multihost'
+    url: git://pkgs.devel.redhat.com/tests/frr
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/tier1-internal.fmf b/plans/internal/tier1-internal.fmf
new file mode 100644
index 0000000..237a86e
--- /dev/null
+++ b/plans/internal/tier1-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier1 tests plan
+discover:
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/frr
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/tier2-internal.fmf b/plans/internal/tier2-internal.fmf
new file mode 100644
index 0000000..d7fcc46
--- /dev/null
+++ b/plans/internal/tier2-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier2 tests plan
+discover:
+    how: fmf
+    filter: 'tier: 2'
+    url: git://pkgs.devel.redhat.com/tests/frr
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/internal/tier3-internal.fmf b/plans/internal/tier3-internal.fmf
new file mode 100644
index 0000000..5688267
--- /dev/null
+++ b/plans/internal/tier3-internal.fmf
@@ -0,0 +1,10 @@
+summary: Internal Tier3 tests plan
+discover:
+    how: fmf
+    filter: 'tier: 3'
+    url: git://pkgs.devel.redhat.com/tests/frr
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream or distro == fedora
\ No newline at end of file
diff --git a/plans/public/Acceptance-public.fmf b/plans/public/Acceptance-public.fmf
new file mode 100644
index 0000000..8781b3e
--- /dev/null
+++ b/plans/public/Acceptance-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public Acceptance tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/frr.git
+    filter: 'tag: Acceptance'
+execute:
+    how: tmt
diff --git a/plans/public/other-public.fmf b/plans/public/other-public.fmf
new file mode 100644
index 0000000..9e4df6e
--- /dev/null
+++ b/plans/public/other-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public other tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/frr.git
+    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -Acceptance & tag: -multihost'
+execute:
+    how: tmt
diff --git a/plans/public.fmf b/plans/public/tier1-public.fmf
similarity index 63%
rename from plans/public.fmf
rename to plans/public/tier1-public.fmf
index f4e8845..cf2e8d5 100644
--- a/plans/public.fmf
+++ b/plans/public/tier1-public.fmf
@@ -1,7 +1,7 @@
-summary: Test plan that runs all tests from tests repo.
+Summary: Public Tier1 tests plan
 discover:
     how: fmf
     url: https://src.fedoraproject.org/tests/frr.git
+    filter: 'tier: 1'
 execute:
     how: tmt
-
diff --git a/plans/public/tier2-public.fmf b/plans/public/tier2-public.fmf
new file mode 100644
index 0000000..e9a13c0
--- /dev/null
+++ b/plans/public/tier2-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public Tier2 tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/frr.git
+    filter: 'tier: 2'
+execute:
+    how: tmt
diff --git a/plans/public/tier3-public.fmf b/plans/public/tier3-public.fmf
new file mode 100644
index 0000000..7ba9e3c
--- /dev/null
+++ b/plans/public/tier3-public.fmf
@@ -0,0 +1,7 @@
+Summary: Public Tier3 tests plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/frr.git
+    filter: 'tier: 3'
+execute:
+    how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 292ecb3..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,15 +0,0 @@
-summary: CI plan, picks Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel
-    how: fmf
-    filter: 'tier: 1'
-    url: git://pkgs.devel.redhat.com/tests/frr
-  - name: fedora
-    how: fmf
-    filter: 'tier: 1'
-    url: "https://src.fedoraproject.org/tests/frr.git"
-execute:
-    how: tmt
-adjust:     
-    enabled: false     
-    when: distro == centos-stream-9