From ead726baaf16fc32a8a2b4798947bd6e281a5cf7 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Mon, 3 Mar 2025 13:27:28 +0100 Subject: [PATCH] Maintentance update to testplans. * Update testplans to point to the merged tests repository * Remove DevTools metadata from plans as collections are no longer maintained * Remove non-relevant kernel-ark plan. * Update tests/README.md --- tests/README.md | 14 ++++---------- tests/build-gating.fmf | 39 -------------------------------------- tests/kernel-ark-build.fmf | 23 ---------------------- tests/lld-alternatives.fmf | 2 +- 4 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 tests/kernel-ark-build.fmf diff --git a/tests/README.md b/tests/README.md index 2e93549..26a7ffb 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,15 +1,9 @@ # Gating testplans for LLVM -The tests for LLVM are in separate repos: - -* llvm: https://src.fedoraproject.org/tests/llvm.git/ -* clang: https://src.fedoraproject.org/tests/clang.git/ -* compiler-rt: https://src.fedoraproject.org/tests/compiler-rt.git/ -* libomp: https://src.fedoraproject.org/tests/libomp.git/ -* python-lit: https://src.fedoraproject.org/tests/python-lit.git/ -* lld: https://src.fedoraproject.org/tests/lld.git/ -* lldb: https://src.fedoraproject.org/tests/lldb.git/ +The tests for LLVM are in a dedicated, separate repo: https://gitlab.com/redhat/centos-stream/tests/llvm.git This directory should contain only fmf plans (such as build-gating.fmf) which import the tests from the tests repo. This can be done using the "url" parameter of the -plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf +plan's "discover" step. + +Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index c7267ef..db92f08 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -20,15 +20,6 @@ adjust: and trigger != build enabled: false - - because: "When testing SCL-ized LLVM, the collection must be enabled first" - environment+: - WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58" - when: "collection == llvm-toolset-13.0" - - because: "When testing SCL-ized LLVM, the collection must be enabled first" - environment+: - WITH_SCL: "scl enable llvm-toolset-14.0 rust-toolset-1.62" - when: "collection == llvm-toolset-14.0" - # Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own. - because: "On CentOS, CRB must be enabled to provide rarer packages" prepare+: @@ -54,36 +45,6 @@ discover: url: https://gitlab.com/redhat/centos-stream/tests/llvm.git ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - - name: clang-tests - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/clang.git - ref: main - filter: "tag:-spoils-installation & tag:-not-in-default" - - name: compiler-rt-tests - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/compiler-rt.git - ref: main - filter: "tag:-spoils-installation & tag:-not-in-default" - - name: libomp-tests - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/libomp.git - ref: main - filter: "tag:-spoils-installation & tag:-not-in-default" - - name: python-lit - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/python-lit.git - ref: main - filter: "tag:-spoils-installation & tag:-not-in-default" - - name: lld-tests - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/lld.git - ref: main - filter: "tag:-spoils-installation & tag:-not-in-default" - - name: lldb-tests - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/lldb.git - ref: main - filter: "tag:-spoils-installation & tag:-not-in-default" execute: how: tmt provision: diff --git a/tests/kernel-ark-build.fmf b/tests/kernel-ark-build.fmf deleted file mode 100644 index 1b47919..0000000 --- a/tests/kernel-ark-build.fmf +++ /dev/null @@ -1,23 +0,0 @@ -summary: Build latest kernel-ark with clang using different build configurations -discover: - how: fmf - url: https://src.fedoraproject.org/tests/clang.git - ref: main - test: kernel-ark-build -execute: - how: tmt -provision: - hardware: - memory: ">=16 GiB" - cpu: - cores: ">=8" -adjust: - - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR." - when: >- - trigger is defined - and trigger != commit - and trigger != build - enabled: false - - because: "Rebuilding kernel-ark is relevant only to rawhide" - when: distro is not defined or distro != fedora-rawhide - enabled: false diff --git a/tests/lld-alternatives.fmf b/tests/lld-alternatives.fmf index 93c9087..3b46dff 100644 --- a/tests/lld-alternatives.fmf +++ b/tests/lld-alternatives.fmf @@ -10,7 +10,7 @@ adjust: discover: - name: lld-tests how: fmf - url: https://src.fedoraproject.org/tests/lld.git + url: https://gitlab.com/redhat/centos-stream/tests/llvm.git ref: main test: ld-alternative execute: