Disable kafka streams test also on quarkus main aarch native

gtroitsk · Oct 9, 2024 · 47c9d88 · 47c9d88
1 parent b6e1406
commit 47c9d88
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.../streams/DisabledOnRHBQAarch64Native.java → ...tive/streams/DisabledOnAarch64Native.java b/.../streams/DisabledOnRHBQAarch64Native.java → ...tive/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/...isabledOnRHBQAarch64NativeConditions.java → ...ms/DisabledOnAarch64NativeConditions.java b/...isabledOnRHBQAarch64NativeConditions.java → ...ms/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/...java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java b/...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/...st/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java b/...st/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/...quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java b/...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")