From 5f243e7da1f99c88dc842b8f5ee90828f4746dd9 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Fri, 2 Sep 2022 11:24:54 +0200 Subject: [PATCH] tests: pull tests from fedora llvm test repos instead rpm repos Related: rhbz#2118319 --- tests/build-gating-libomp.fmf | 47 ----------------------------------- tests/build-gating.fmf | 38 ++++++++++++++++------------ 2 files changed, 22 insertions(+), 63 deletions(-) delete mode 100644 tests/build-gating-libomp.fmf diff --git a/tests/build-gating-libomp.fmf b/tests/build-gating-libomp.fmf deleted file mode 100644 index e61824c..0000000 --- a/tests/build-gating-libomp.fmf +++ /dev/null @@ -1,47 +0,0 @@ -# -# Build/PR gating tests for *LLVM 13* -# -# Imports and runs tests provided by Fedora LLVM git for the matching LLVM version. -# -# NOTE: *always* keep this file in sync with upstream, i.e. Fedora. Since we cannot "discover" a plan, -# we must duplicate at least some part of upstream plan setup, like `adjust` or `provision`. Not necessarily -# all steps, but if we do need some of them here, let's focus on making changes in upstream first, to preserve -# one source of truth. Once TMT learns to include whole plans, we could drop the copied content from here. -# - -summary: libomp clang tests for build/PR gating -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: "When testing SCL-ized LLVM, the collection must be enabled first" - environment+: - WITH_SCL: "scl enable llvm-toolset-13.0" - when: "collection == llvm-toolset-13.0" - - - because: "libomp not supported in s390x" - when: arch == s390x - enabled: false - -discover: - - name: clang-upstream - how: fmf - url: https://src.fedoraproject.org/rpms/clang.git - ref: rawhide - test: libomp -execute: - how: tmt -prepare: - # We want to make sure libomp is not already present on the system to ensure - # that clang pulls in the correct libomp dependencies when it is installed. - - name: Drop libomp - how: shell - script: | - yum erase -y libomp libomp-devel clang clang-libs -provision: - hardware: - memory: ">= 4 GiB" \ No newline at end of file diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index b967b21..b2e9815 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -21,51 +21,57 @@ adjust: how: shell script: dnf config-manager --set-enabled rhel-CRB when: >- - distro == centos - or distro == rhel-9 + distro == rhel-9 or distro == rhel-8 + - because: "On CentOS, CRB must be enabled to provide rarer packages" + prepare+: + - name: Enable CRB + how: shell + script: dnf config-manager --set-enabled crb + when: >- + distro == centos discover: - name: llvm-upstream how: fmf - url: https://src.fedoraproject.org/rpms/llvm.git - ref: rawhide + url: https://src.fedoraproject.org/tests/llvm.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - name: clang-upstream how: fmf - url: https://src.fedoraproject.org/rpms/clang.git - ref: rawhide + url: https://src.fedoraproject.org/tests/clang.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - name: python-lit-upstream how: fmf - url: https://src.fedoraproject.org/rpms/python-lit.git - ref: rawhide + url: https://src.fedoraproject.org/tests/python-lit.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - name: lldb-upstream how: fmf - url: https://src.fedoraproject.org/rpms/lldb.git - ref: rawhide + url: https://src.fedoraproject.org/tests/lldb.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - name: lld-upstream how: fmf - url: https://src.fedoraproject.org/rpms/lld.git - ref: rawhide + url: https://src.fedoraproject.org/tests/lld.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - name: libomp-upstream how: fmf - url: https://src.fedoraproject.org/rpms/libomp.git - ref: rawhide + url: https://src.fedoraproject.org/tests/libomp.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" - name: compiler-rt-upstream how: fmf - url: https://src.fedoraproject.org/rpms/compiler-rt.git - ref: rawhide + url: https://src.fedoraproject.org/tests/compiler-rt.git + ref: main filter: "tag:-spoils-installation & tag:-not-in-default" execute: