From f06e7714e063d61cbbacf62dddc74cd53995dbde Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Thu, 26 Sep 2024 20:02:16 +0300 Subject: [PATCH] Skip kafka-oauth-keycloak test with GraalVM >= 24.1 The test is known to fail for quite some time generating a lot of CI noise. Let's skip it till https://github.com/quarkusio/quarkus/issues/39634 is resolved. --- .../src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java | 1 + .../src/test/java/io/quarkus/it/kafka/KafkaOauthTest.java | 3 +++ .../quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java | 2 +- .../src/main/java/io/quarkus/test/junit/GraalVMVersion.java | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java index 03d17aa16bfac..f8058f761a992 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java @@ -192,6 +192,7 @@ public static final class Version implements Comparable { public static final Version VERSION_23_0_0 = new Version("GraalVM 23.0.0", "23.0.0", "17", Distribution.GRAALVM); public static final Version VERSION_23_1_0 = new Version("GraalVM 23.1.0", "23.1.0", "21", Distribution.GRAALVM); public static final Version VERSION_24_0_0 = new Version("GraalVM 24.0.0", "24.0.0", "22", Distribution.GRAALVM); + public static final Version VERSION_24_0_999 = new Version("GraalVM 24.0.999", "24.0.999", "22", Distribution.GRAALVM); /** * The minimum version of GraalVM supported by Quarkus. diff --git a/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaOauthTest.java b/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaOauthTest.java index c450e43a8b5f9..eeb223b7b0126 100644 --- a/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaOauthTest.java +++ b/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaOauthTest.java @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.DisableIfBuiltWithGraalVMNewerThan; +import io.quarkus.test.junit.GraalVMVersion; import io.quarkus.test.junit.QuarkusTest; import io.restassured.common.mapper.TypeRef; @@ -20,6 +22,7 @@ public class KafkaOauthTest { }; @Test + @DisableIfBuiltWithGraalVMNewerThan(GraalVMVersion.GRAALVM_24_0_999) // See https://github.com/quarkusio/quarkus/issues/39634 public void test() { await().untilAsserted(() -> Assertions.assertEquals(2, get("/kafka").as(TYPE_REF).size())); } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java index 05a5a44fbf6a0..02ac2f466fd74 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java @@ -9,7 +9,7 @@ /** * Used to signal that a test class or method should be disabled if the version of GraalVM used to build the native binary - * under test was older than the supplied version. + * under test was newer than the supplied version. * * This annotation should only be used on a test classes annotated with {@link QuarkusIntegrationTest}. * If it is used on other test classes, it will have no effect. diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/GraalVMVersion.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/GraalVMVersion.java index df95a13f166b9..1f4aec65c48b8 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/GraalVMVersion.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/GraalVMVersion.java @@ -4,7 +4,8 @@ public enum GraalVMVersion { GRAALVM_23_1_0(GraalVM.Version.VERSION_23_1_0), - GRAALVM_24_0_0(GraalVM.Version.VERSION_24_0_0); + GRAALVM_24_0_0(GraalVM.Version.VERSION_24_0_0), + GRAALVM_24_0_999(GraalVM.Version.VERSION_24_0_999); private final GraalVM.Version version;