From 30640c9a0878666fe2c5e51bc6254f3121ebb3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Thu, 6 Jun 2024 11:03:52 +0200 Subject: [PATCH] Update of fmf plans and gating for c10s --- gating.yaml | 18 ++++++++-------- plans.fmf | 36 +++++++++++++++++++++++++++++++ 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/other-public.fmf | 7 ------ plans/public/tier1-public.fmf | 7 ------ plans/public/tier2-public.fmf | 7 ------ plans/public/tier3-public.fmf | 7 ------ 10 files changed, 45 insertions(+), 77 deletions(-) create mode 100644 plans.fmf delete mode 100644 plans/internal/other-internal.fmf delete mode 100644 plans/internal/tier1-internal.fmf delete mode 100644 plans/internal/tier2-internal.fmf delete mode 100644 plans/internal/tier3-internal.fmf delete mode 100644 plans/public/other-public.fmf delete mode 100644 plans/public/tier1-public.fmf delete mode 100644 plans/public/tier2-public.fmf delete mode 100644 plans/public/tier3-public.fmf diff --git a/gating.yaml b/gating.yaml index 68a833c..1b16508 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,25 +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.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} -#gating rawhide +#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.tier0.functional} - -#gating RHEL + - !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/internal/tier1-internal.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..b48f048 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,36 @@ +/tier1-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/iperf3.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://src.fedoraproject.org/tests/iperf3.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/iperf3.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://src.fedoraproject.org/tests/iperf3.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/iperf3.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://src.fedoraproject.org/tests/iperf3.git + name: /plans/others/public + diff --git a/plans/internal/other-internal.fmf b/plans/internal/other-internal.fmf deleted file mode 100644 index 26cd309..0000000 --- a/plans/internal/other-internal.fmf +++ /dev/null @@ -1,10 +0,0 @@ -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/iperf3 -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream or distro == fedora diff --git a/plans/internal/tier1-internal.fmf b/plans/internal/tier1-internal.fmf deleted file mode 100644 index 3578bfc..0000000 --- a/plans/internal/tier1-internal.fmf +++ /dev/null @@ -1,10 +0,0 @@ -summary: Internal Tier1 tests plan -discover: - how: fmf - filter: 'tier: 1' - url: git://pkgs.devel.redhat.com/tests/iperf3 -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream or distro == fedora diff --git a/plans/internal/tier2-internal.fmf b/plans/internal/tier2-internal.fmf deleted file mode 100644 index 6b62b1b..0000000 --- a/plans/internal/tier2-internal.fmf +++ /dev/null @@ -1,10 +0,0 @@ -summary: Internal Tier2 tests plan -discover: - how: fmf - filter: 'tier: 2' - url: git://pkgs.devel.redhat.com/tests/iperf3 -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream or distro == fedora diff --git a/plans/internal/tier3-internal.fmf b/plans/internal/tier3-internal.fmf deleted file mode 100644 index fe71be6..0000000 --- a/plans/internal/tier3-internal.fmf +++ /dev/null @@ -1,10 +0,0 @@ -summary: Internal Tier3 tests plan -discover: - how: fmf - filter: 'tier: 3' - url: git://pkgs.devel.redhat.com/tests/iperf3 -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream or distro == fedora diff --git a/plans/public/other-public.fmf b/plans/public/other-public.fmf deleted file mode 100644 index a72356a..0000000 --- a/plans/public/other-public.fmf +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Public other tests plan -discover: - how: fmf - url: https://src.fedoraproject.org/tests/iperf3.git - filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -Acceptance & tag: -multihost' -execute: - how: tmt diff --git a/plans/public/tier1-public.fmf b/plans/public/tier1-public.fmf deleted file mode 100644 index 29aa0de..0000000 --- a/plans/public/tier1-public.fmf +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Public Tier1 tests plan -discover: - how: fmf - url: https://src.fedoraproject.org/tests/iperf3.git - filter: 'tier: 1' -execute: - how: tmt diff --git a/plans/public/tier2-public.fmf b/plans/public/tier2-public.fmf deleted file mode 100644 index a8449eb..0000000 --- a/plans/public/tier2-public.fmf +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Public Tier2 tests plan -discover: - how: fmf - url: https://src.fedoraproject.org/tests/iperf3.git - filter: 'tier: 2' -execute: - how: tmt diff --git a/plans/public/tier3-public.fmf b/plans/public/tier3-public.fmf deleted file mode 100644 index 50800a0..0000000 --- a/plans/public/tier3-public.fmf +++ /dev/null @@ -1,7 +0,0 @@ -Summary: Public Tier3 tests plan -discover: - how: fmf - url: https://src.fedoraproject.org/tests/iperf3.git - filter: 'tier: 3' -execute: - how: tmt