From b533170174d8a4dbe90cefab6360eeb46a1e7892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Tue, 24 Jan 2023 15:09:53 +0100 Subject: [PATCH] Make requirements in gating tests more explicit Make requirements stricter (required packages instead of recommended packages) and remove requirements that are no longer needed. The previous requirements caused failures in manual testing and possibly some gating failures as well. --- .../main.fmf | 4 +++- tests/Regression/identify/main.fmf | 11 ++--------- .../Regression/lto-preprocessor-options/main.fmf | 7 ++++--- .../main.fmf | 4 ++-- .../processing-params-in-reverse-order/main.fmf | 4 ++-- .../main.fmf | 5 +++-- tests/Regression/testsuite/main.fmf | 16 ++++++---------- .../main.fmf | 5 +++-- tests/Sanity/smoke/main.fmf | 6 +++--- 9 files changed, 28 insertions(+), 34 deletions(-) diff --git a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf index 435d7ff..e0cbc5d 100644 --- a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf +++ b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf @@ -8,9 +8,11 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: +require: - annobin-annocheck +- annobin-plugin-gcc - gcc +- redhat-rpm-config duration: 48h extra-summary: /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check extra-task: /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check diff --git a/tests/Regression/identify/main.fmf b/tests/Regression/identify/main.fmf index a10e87d..674544e 100644 --- a/tests/Regression/identify/main.fmf +++ b/tests/Regression/identify/main.fmf @@ -7,15 +7,8 @@ component: test: ./runtest.sh framework: beakerlib recommend: -- annobin -- devtoolset-10 -- devtoolset-10-annocheck -- devtoolset-11 -- devtoolset-11-annocheck -- gcc-toolset-10 -- gcc-toolset-10-annocheck -- gcc-toolset-11 -- gcc-toolset-11-annocheck +- annobin-plugin-gcc +- annobin-annocheck duration: 48h extra-summary: /tools/annobin/Regression/identify extra-task: /tools/annobin/Regression/identify diff --git a/tests/Regression/lto-preprocessor-options/main.fmf b/tests/Regression/lto-preprocessor-options/main.fmf index 03e6b88..2a3e56a 100644 --- a/tests/Regression/lto-preprocessor-options/main.fmf +++ b/tests/Regression/lto-preprocessor-options/main.fmf @@ -6,11 +6,12 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- gcc -- annobin +require: +- annobin-plugin-gcc - annobin-annocheck - redhat-rpm-config +- gcc +- redhat-rpm-config duration: 48h extra-summary: /tools/annobin/Regression/lto-preprocessor-options extra-task: /tools/annobin/Regression/lto-preprocessor-options diff --git a/tests/Regression/missing-check-for-x86-property-note-content/main.fmf b/tests/Regression/missing-check-for-x86-property-note-content/main.fmf index a7afb11..b4ab7fd 100644 --- a/tests/Regression/missing-check-for-x86-property-note-content/main.fmf +++ b/tests/Regression/missing-check-for-x86-property-note-content/main.fmf @@ -7,8 +7,8 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-annocheck duration: 48h link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1991931 diff --git a/tests/Regression/processing-params-in-reverse-order/main.fmf b/tests/Regression/processing-params-in-reverse-order/main.fmf index 19b497d..99adc08 100644 --- a/tests/Regression/processing-params-in-reverse-order/main.fmf +++ b/tests/Regression/processing-params-in-reverse-order/main.fmf @@ -7,8 +7,8 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-annocheck duration: 48h link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1988714 diff --git a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf b/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf index bd8362f..07395fa 100644 --- a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf +++ b/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf @@ -7,8 +7,9 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-plugin-gcc +- annobin-annocheck - libstdc++ duration: 48h link: diff --git a/tests/Regression/testsuite/main.fmf b/tests/Regression/testsuite/main.fmf index 7352f78..f117f62 100644 --- a/tests/Regression/testsuite/main.fmf +++ b/tests/Regression/testsuite/main.fmf @@ -6,23 +6,19 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-plugin-gcc - annobin-annocheck - binutils-devel -- gcc -- gcc-c++ +- bzip2-devel +- dnf - elfutils - elfutils-devel +- gcc-c++ +- gcc-plugin-devel - make - rpm-build - rpm-devel -- gcc-plugin-devel -- yum -- dnf -- yum-utils -- bzip2-devel -- rpm-build duration: 48h extra-summary: /tools/annobin/Regression/testsuite extra-task: /tools/annobin/Regression/testsuite diff --git a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf index 9aea593..9ece622 100644 --- a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf +++ b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf @@ -7,8 +7,9 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-plugin-gcc +- annobin-annocheck duration: 48h link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973981 diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf index 49d2862..fca8ae4 100644 --- a/tests/Sanity/smoke/main.fmf +++ b/tests/Sanity/smoke/main.fmf @@ -6,11 +6,11 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: +require: +- annobin-plugin-gcc +- annobin-annocheck - man-db - gcc -- annobin -- annobin-annocheck duration: 48h extra-summary: /tools/annobin/Sanity/smoke extra-task: /tools/annobin/Sanity/smoke