From b265d3117ba14f80aaa0cdb50843cbf6489dce6d Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Thu, 9 May 2024 11:23:46 +0200 Subject: [PATCH] Migrated to SPDX license Improving testing for RHEL10 --- ci.fmf | 1 + gating.yaml | 11 ++++++++++- iperf3.spec | 8 ++++++-- plans/all.fmf | 6 ------ 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 +++++++ 12 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 ci.fmf delete mode 100644 plans/all.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/other-public.fmf create mode 100644 plans/public/tier1-public.fmf create mode 100644 plans/public/tier2-public.fmf create mode 100644 plans/public/tier3-public.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 195c6fe..68a833c 100644 --- a/gating.yaml +++ b/gating.yaml @@ -13,4 +13,13 @@ product_versions: decision_contexts: [bodhi_update_push_stable] subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.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} diff --git a/iperf3.spec b/iperf3.spec index 5c5554e..1e6690d 100644 --- a/iperf3.spec +++ b/iperf3.spec @@ -1,9 +1,9 @@ Name: iperf3 Version: 3.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Measurement tool for TCP/UDP bandwidth performance -License: BSD +License: BSD-3-Clause-LBNL AND MIT AND dtoa AND BSD-3-Clause AND NCSA AND LicenseRef-Fedora-Public-Domain URL: https://github.com/esnet/iperf Source0: %{url}/archive/%{version}/iperf-%{version}.tar.gz # https://github.com/esnet/iperf/pull/1278 @@ -54,6 +54,10 @@ rm -f %{buildroot}%{_libdir}/libiperf.la %{_libdir}/*.so %changelog +* Thu May 09 2024 Michal Ruprich - 3.16-4 +- Migrated to SPDX license +- Improving testing for RHEL10 + * Wed Jan 24 2024 Fedora Release Engineering - 3.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/plans/all.fmf b/plans/all.fmf deleted file mode 100644 index cba158e..0000000 --- a/plans/all.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Test plan with all Fedora tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/iperf3.git -execute: - how: tmt diff --git a/plans/internal/other-internal.fmf b/plans/internal/other-internal.fmf new file mode 100644 index 0000000..26cd309 --- /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/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 new file mode 100644 index 0000000..3578bfc --- /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/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 new file mode 100644 index 0000000..6b62b1b --- /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/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 new file mode 100644 index 0000000..fe71be6 --- /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/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 new file mode 100644 index 0000000..a72356a --- /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/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 new file mode 100644 index 0000000..29aa0de --- /dev/null +++ b/plans/public/tier1-public.fmf @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..a8449eb --- /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/iperf3.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..50800a0 --- /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/iperf3.git + filter: 'tier: 3' +execute: + how: tmt