From ea1ad64949aa6b468db5fd286e8375b875b7bf0c Mon Sep 17 00:00:00 2001 From: Jiri Jaburek Date: Tue, 20 Aug 2024 13:31:53 +0200 Subject: [PATCH 1/2] Revert "make /static-checks/nist-validation require any java-openjdk" This reverts commit ec3efb8d8bd932663c98418c2451e35045af862d. --- static-checks/nist-validation/main.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static-checks/nist-validation/main.fmf b/static-checks/nist-validation/main.fmf index 3c1f2259..a0018c08 100644 --- a/static-checks/nist-validation/main.fmf +++ b/static-checks/nist-validation/main.fmf @@ -5,7 +5,7 @@ environment+: PYTHONPATH: ../.. duration: 15m require+: - - java-openjdk + - java-17-openjdk adjust: - enabled: false when: arch != x86_64 From e0a0471c03a7aad096cc1746888e75acc62c6b9e Mon Sep 17 00:00:00 2001 From: Jiri Jaburek Date: Tue, 20 Aug 2024 13:33:59 +0200 Subject: [PATCH 2/2] disable /static-checks/nist-validation on RHEL-10 for now Signed-off-by: Jiri Jaburek --- static-checks/nist-validation/main.fmf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/static-checks/nist-validation/main.fmf b/static-checks/nist-validation/main.fmf index a0018c08..2db0c428 100644 --- a/static-checks/nist-validation/main.fmf +++ b/static-checks/nist-validation/main.fmf @@ -5,8 +5,13 @@ environment+: PYTHONPATH: ../.. duration: 15m require+: + # we use java-17 specifically here because the NIST tool needs it and does not + # work with any newer version - java-17-openjdk adjust: - - enabled: false - when: arch != x86_64 - continue: false + - when: arch != x86_64 + enabled: false + because: the test is not architecture-specific, one is enough + - when: distro == rhel-10 + enabled: false + because: TODO - RHEL-10 doesn't have Java 17, see requires above