From 60a854582e7a56d7be618957005caba3741789cb Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Fri, 3 Jul 2026 11:19:35 +0200 Subject: [PATCH] replace kernel-qe-ci gating with osci tier0 plans JIRA: https://redhat.atlassian.net/browse/RHEL-186035 Upstream-status: RHEL-Only Signed-off-by: Bruno Goncalves --- .gitignore | 1 + redhat/Makefile | 2 +- redhat/kernel.spec.template | 2 +- redhat/scripts/expand_srpm.sh | 8 ++++++++ redhat/scripts/gating/.fmf/version | 1 + redhat/scripts/gating/gating.fmf | 7 +++++++ redhat/scripts/gating/gating.yaml | 18 ------------------ 7 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 redhat/scripts/gating/.fmf/version create mode 100644 redhat/scripts/gating/gating.fmf delete mode 100644 redhat/scripts/gating/gating.yaml diff --git a/.gitignore b/.gitignore index c078e8be6435..77ce94329af0 100644 --- a/.gitignore +++ b/.gitignore @@ -105,6 +105,7 @@ modules.order !.clang-format !.cocciconfig !.editorconfig +!.fmf !.get_maintainer.ignore !.gitattributes !.gitignore diff --git a/redhat/Makefile b/redhat/Makefile index ccfe08b4484e..a32817a4a5e2 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -762,7 +762,7 @@ sources-rh: $(TARBALL) $(KABI_TARBALL) $(KABIDW_TARBALL) generate-testpatch-tmp kabi/check-kabi \ configs/$(SPECPACKAGE_NAME)-*.config \ configs/partial*.config \ - scripts/gating/gating.yaml \ + scripts/gating/gating.fmf \ scripts/filtermods.py \ scripts/mod/mod-denylist.sh \ scripts/mod/mod-sign.sh \ diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index 9315fa1e60ed..cca7e03effd0 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1120,7 +1120,7 @@ Source3002: Patchlist.changelog Source4000: README.rst Source4001: rpminspect.yaml -Source4002: gating.yaml +Source4002: gating.fmf ## Patches needed for building this package diff --git a/redhat/scripts/expand_srpm.sh b/redhat/scripts/expand_srpm.sh index 5992e9116fa2..68cbf9f36c5b 100755 --- a/redhat/scripts/expand_srpm.sh +++ b/redhat/scripts/expand_srpm.sh @@ -25,4 +25,12 @@ echo "*.bz2" >> .gitignore # expand the srpm into the tree rpm2cpio "$SRPM" | cpio -idmv +# set up TMT/FMF tree for gating: gating.fmf is shipped as a flat Source +# in the SRPM but needs directory structure for tmt plan discovery +if [ -f gating.fmf ]; then + mkdir -p .fmf plans + echo 1 > .fmf/version + cp gating.fmf plans/main.fmf +fi + git add -A diff --git a/redhat/scripts/gating/.fmf/version b/redhat/scripts/gating/.fmf/version new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/redhat/scripts/gating/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/redhat/scripts/gating/gating.fmf b/redhat/scripts/gating/gating.fmf new file mode 100644 index 000000000000..925d9090054f --- /dev/null +++ b/redhat/scripts/gating/gating.fmf @@ -0,0 +1,7 @@ +plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/kernel/test-plans.git + ref: main + scope: all-plans + importing: become-parent + name: /plans/gating/kernel/rhel-10/ diff --git a/redhat/scripts/gating/gating.yaml b/redhat/scripts/gating/gating.yaml deleted file mode 100644 index 3bd511200616..000000000000 --- a/redhat/scripts/gating/gating.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-64k-aarch64.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-aarch64.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-ppc64le.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-rt-64k-aarch64.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-rt-aarch64.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-rt-x86_64.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-s390x.tier1.functional} - - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-x86_64.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-aws-ci_x86_64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-aws-ci_aarch64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-azure-ci_x86_64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-azure-ci_aarch64.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: s1-gcp-ci.brew-build.tier1.functional}