From 347d20d5d745e0b5e9628354ee3b1028fa04531e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Wed, 11 Oct 2023 09:53:48 +0200 Subject: [PATCH] Do not compare minor distro versions --- tests/rebuilds/kernel/main.fmf | 4 ++-- tests/testsuite/main.fmf | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/rebuilds/kernel/main.fmf b/tests/rebuilds/kernel/main.fmf index d02e57f..9fb99b3 100644 --- a/tests/rebuilds/kernel/main.fmf +++ b/tests/rebuilds/kernel/main.fmf @@ -53,12 +53,12 @@ adjust+: KERNEL: kernel-core - because: "python-devel has different names in different distros" - when: distro == rhel-8.9.0 + when: distro == rhel-8.9 require+: - python3-devel - because: "python-devel has different names in different distros" - when: distro != rhel-8.9.0 + when: distro != rhel-8.9 require+: - python-devel diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf index 6124601..a6098b1 100644 --- a/tests/testsuite/main.fmf +++ b/tests/testsuite/main.fmf @@ -19,33 +19,33 @@ require+: # Adjust rules adjust+: - because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation" - when: distro == rhel-9.3.0 and collection is not defined + when: distro == rhel-9.3 and collection is not defined test: "$WITH_SCL ./test-rhel-9.3.0.sh" - because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation" - when: distro == rhel-9.4.0 and collection is not defined + when: distro == rhel-9.4 and collection is not defined test: "$WITH_SCL ./test-rhel-9.3.0.sh" - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels" - when: distro == rhel-9.3.0 and collection == gcc-toolset-13 + when: distro == rhel-9.3 and collection == gcc-toolset-13 test: "$WITH_SCL ./test-rhel-9.3.0.sh" environment+: CROSS_BINUTILS: "no" - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels" - when: distro == rhel-9.4.0 and collection == gcc-toolset-13 + when: distro == rhel-9.4 and collection == gcc-toolset-13 test: "$WITH_SCL ./test-rhel-9.3.0.sh" environment+: CROSS_BINUTILS: "no" - because: "On RHEL-8.10.0 and newer, system binutils build extra binaries for cross compilation" - when: distro == rhel-8.10.0 and collection is not defined + when: distro == rhel-8.10 and collection is not defined test: "$WITH_SCL ./test-rhel-9.3.0.sh" environment+: CROSS_BINUTILS: "no" - because: "On RHEL-8.10.0 and newer, gcc-toolset-13 binutils build has extra directory levels" - when: distro == rhel-8.10.0 and collection == gcc-toolset-13 + when: distro == rhel-8.10 and collection == gcc-toolset-13 test: "$WITH_SCL ./test-rhel-9.3.0.sh" environment+: CROSS_BINUTILS: "no"