From f97fd4bb290727e8d0acbe0ab09f6c9db102c9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Wed, 15 Dec 2021 13:03:43 +0100 Subject: [PATCH] tests: add extra repositories to allow installation of ninja/libstdc++ --- tests/build-gating.fmf | 21 +++++++++++++++++++++ tests/integration-test-suite/main.fmf | 9 ++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index d9bf11c..c8d0b3f 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -24,6 +24,27 @@ adjust: WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58" when: "collection == llvm-toolset-13.0" + # Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own. + - because: "On RHEL, CRB must be enabled to provide rarer packages" + prepare+: + - name: Enable CRB + how: shell + script: dnf config-manager --set-enabled rhel-CRB + when: >- + distro == centos + or distro == rhel-9 + or distro == rhel-8 + + # Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own. + - because: "On RHEL-7, EPEL must be enabled to provided rarer packages" + prepare+: + - name: Enable EPEL + how: shell + script: | + rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + yum-config-manager --enable epel + when: distro == rhel-7 + discover: how: fmf execute: diff --git a/tests/integration-test-suite/main.fmf b/tests/integration-test-suite/main.fmf index 035f651..18163d9 100644 --- a/tests/integration-test-suite/main.fmf +++ b/tests/integration-test-suite/main.fmf @@ -3,9 +3,10 @@ description: | Run the upstream LLVM integration test suite test: "$WITH_SCL ./test.sh" require: - - ninja-build - git - make + # These require special repositories to be enabled on RHEL + - ninja-build - libstdc++-static adjust: # Common requirements when LLVM is not SCL-ized @@ -46,5 +47,7 @@ adjust: - environment+: CMAKE_CXXLIB: "-DENABLE_LIBCXX=OFF" - when: "distro == rhel" - because: libcxx is not shipped with RHEL + when: >- + distro == centos + or distro == rhel + because: libcxx is not shipped with neither Centos nor RHEL