From 47c9d88f6230ca6b1ffd9bd890641d9a14ff863b Mon Sep 17 00:00:00 2001 From: Martin Ocenas Date: Wed, 9 Oct 2024 16:09:42 +0200 Subject: [PATCH] Disable kafka streams test also on quarkus main aarch native --- ...BQAarch64Native.java => DisabledOnAarch64Native.java} | 4 ++-- ...tions.java => DisabledOnAarch64NativeConditions.java} | 9 ++++----- .../streams/OpenShiftAmqStreamsKafkaStreamIT.java | 1 + .../reactive/streams/OpenShiftStrimziKafkaStreamIT.java | 2 +- .../OperatorOpenShiftAmqStreamsKafkaStreamIT.java | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) rename messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/{DisabledOnRHBQAarch64Native.java => DisabledOnAarch64Native.java} (82%) rename messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/{DisabledOnRHBQAarch64NativeConditions.java => DisabledOnAarch64NativeConditions.java} (67%) diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64Native.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnAarch64Native.java similarity index 82% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64Native.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnAarch64Native.java index 1fe86668a..2eb2304e9 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64Native.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnAarch64Native.java @@ -11,8 +11,8 @@ @Inherited @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) -@ExtendWith(DisabledOnRHBQAarch64NativeConditions.class) -public @interface DisabledOnRHBQAarch64Native { +@ExtendWith(DisabledOnAarch64NativeConditions.class) +public @interface DisabledOnAarch64Native { /** * Why is the annotated test class or test method disabled. diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnAarch64NativeConditions.java similarity index 67% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnAarch64NativeConditions.java index aa53c6e65..347825dcd 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnRHBQAarch64NativeConditions.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DisabledOnAarch64NativeConditions.java @@ -6,17 +6,16 @@ import io.quarkus.test.services.quarkus.model.QuarkusProperties; -public class DisabledOnRHBQAarch64NativeConditions implements ExecutionCondition { +public class DisabledOnAarch64NativeConditions implements ExecutionCondition { @Override public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) { - boolean isRHBQ = QuarkusProperties.isRHBQ(); boolean isNative = QuarkusProperties.isNativeEnabled(); boolean isAarch64 = "true".equals(System.getProperty("ts.arm.missing.services.excludes")); - if (isRHBQ && isAarch64 && isNative) { - return ConditionEvaluationResult.disabled("It is RHBQ running on aarch64 in native mode."); + if (isAarch64 && isNative) { + return ConditionEvaluationResult.disabled("It is running on aarch64 in native mode."); } else { - return ConditionEvaluationResult.enabled("It is not RHBQ running on aarch64 in native mode."); + return ConditionEvaluationResult.enabled("It is not running on aarch64 in native mode."); } } } diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java index bf821a288..4316772a7 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java @@ -11,6 +11,7 @@ import io.quarkus.test.services.containers.model.KafkaVendor; @OpenShiftScenario +@DisabledOnAarch64Native(reason = "https://issues.redhat.com/browse/QUARKUS-4321") @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true") public class OpenShiftAmqStreamsKafkaStreamIT extends BaseKafkaStreamTest { diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java index 1c0621301..6baf1e2c6 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java @@ -3,6 +3,6 @@ import io.quarkus.test.scenarios.OpenShiftScenario; @OpenShiftScenario -@DisabledOnRHBQAarch64Native(reason = "https://issues.redhat.com/browse/QUARKUS-4321") +@DisabledOnAarch64Native(reason = "https://issues.redhat.com/browse/QUARKUS-4321") public class OpenShiftStrimziKafkaStreamIT extends StrimziKafkaStreamIT { } diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java index 62e8f1da8..78ebbc33f 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java @@ -8,6 +8,7 @@ import io.quarkus.test.services.operator.KafkaInstance; @OpenShiftScenario +@DisabledOnAarch64Native(reason = "https://issues.redhat.com/browse/QUARKUS-4321") public class OperatorOpenShiftAmqStreamsKafkaStreamIT extends BaseKafkaStreamTest { @Operator(name = "amq-streams", source = "redhat-operators")