From a434bbb9b5b1c7d84a43e361c38299148e8c0e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Tue, 14 Mar 2023 10:14:07 +0100 Subject: [PATCH] Enable tests with Quarkus OpenShift extension as upstream issue is fixed --- .../OpenShiftApiServerConfigMapConfigIT.java | 3 -- ...penShiftApiServerConfigSecretConfigIT.java | 3 -- .../api/server/OpenShiftBaseConfigIT.java | 2 -- .../OpenShiftConfigSourcePriorityIT.java | 2 -- .../OpenShiftFailOnMissingConfigIT.java | 2 -- .../OpenShiftFileSystemConfigMapConfigIT.java | 3 -- ...enShiftFileSystemConfigSecretConfigIT.java | 3 -- ...lessExtensionOpenShiftFunqyKnEventsIT.java | 2 -- ...kerBuildStrategyHttpMinimumReactiveIT.java | 4 +-- ...ftUsingExtensionHttpMinimumReactiveIT.java | 4 +-- ...trategyOpenShiftHttpMinimumReactiveIT.java | 4 +-- ...tensionOpenShiftHttpMinimumReactiveIT.java | 4 +-- ...nsionDockerBuildStrategyHttpMinimumIT.java | 4 +-- .../OpenShiftUsingExtensionHttpMinimumIT.java | 4 +-- ...erBuildStrategyOpenShiftHttpMinimumIT.java | 4 +-- ...erlessExtensionOpenShiftHttpMinimumIT.java | 4 +-- .../OpenShiftCompressionHandlerIT.java | 2 -- .../reactive/OpenShiftHttpCachingIT.java | 2 -- .../vertx/OpenShiftUsingExtensionVertxIT.java | 2 -- ...onDockerBuildStrategyOpenShiftVertxIT.java | 2 -- .../ServerlessExtensionOpenShiftVertxIT.java | 2 -- ...OperatorOpenShiftInfinispanCountersIT.java | 2 -- .../OperatorOpenShiftInfinispanObjectsIT.java | 1 - lifecycle-application/pom.xml | 33 +++++++++++++++++-- .../OpenShiftLifecycleApplicationIT.java | 2 -- .../prometheus/OpenShiftCustomMetricsIT.java | 2 -- ...onDockerBuildStrategyManyExtensionsIT.java | 4 +-- ...enShiftUsingExtensionManyExtensionsIT.java | 4 +-- ...uildStrategyOpenShiftManyExtensionsIT.java | 4 +-- ...essExtensionOpenShiftManyExtensionsIT.java | 4 +-- 30 files changed, 43 insertions(+), 75 deletions(-) diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigMapConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigMapConfigIT.java index 5711585516..17abeddf2d 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigMapConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigMapConfigIT.java @@ -1,11 +1,8 @@ package io.quarkus.ts.configmap.api.server; -import org.junit.jupiter.api.Disabled; - import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.services.QuarkusApplication; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") public class OpenShiftApiServerConfigMapConfigIT extends OpenShiftBaseConfigIT { @QuarkusApplication diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigSecretConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigSecretConfigIT.java index 22c7ca07d2..38384a7588 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigSecretConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftApiServerConfigSecretConfigIT.java @@ -1,11 +1,8 @@ package io.quarkus.ts.configmap.api.server; -import org.junit.jupiter.api.Disabled; - import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.services.QuarkusApplication; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") public class OpenShiftApiServerConfigSecretConfigIT extends OpenShiftBaseConfigIT { @QuarkusApplication diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java index 9659389b74..98baa1ae00 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java @@ -11,7 +11,6 @@ import jakarta.inject.Inject; import org.apache.http.HttpStatus; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -20,7 +19,6 @@ import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public abstract class OpenShiftBaseConfigIT { diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java index c97a5cde06..8078ebdaf2 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java @@ -10,7 +10,6 @@ import jakarta.inject.Inject; import org.apache.http.HttpStatus; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -21,7 +20,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.response.Response; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftConfigSourcePriorityIT { diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFailOnMissingConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFailOnMissingConfigIT.java index c030190161..0819ac74cf 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFailOnMissingConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFailOnMissingConfigIT.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -10,7 +9,6 @@ import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.services.QuarkusApplication; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftFailOnMissingConfigIT { diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigMapConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigMapConfigIT.java index f211eb9772..3b656785ed 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigMapConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigMapConfigIT.java @@ -1,11 +1,8 @@ package io.quarkus.ts.configmap.api.server; -import org.junit.jupiter.api.Disabled; - import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.services.QuarkusApplication; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") public class OpenShiftFileSystemConfigMapConfigIT extends OpenShiftBaseConfigIT { @QuarkusApplication diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigSecretConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigSecretConfigIT.java index 56bc6baf16..2b3a355ec7 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigSecretConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftFileSystemConfigSecretConfigIT.java @@ -1,11 +1,8 @@ package io.quarkus.ts.configmap.api.server; -import org.junit.jupiter.api.Disabled; - import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.services.QuarkusApplication; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") public class OpenShiftFileSystemConfigSecretConfigIT extends OpenShiftBaseConfigIT { @QuarkusApplication diff --git a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java index b51b18f2b7..25b1eacc37 100644 --- a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java +++ b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java @@ -20,7 +20,6 @@ import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -36,7 +35,6 @@ import io.quarkus.test.services.knative.eventing.spi.ForwardResponseDTO; import io.restassured.common.mapper.TypeRef; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java index f6a817a592..09ac48d62d 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) public class OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumReactiveIT extends HttpMinimumReactiveIT { -} \ No newline at end of file +} diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java index ff733cc86e..9d5c06c7c3 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/OpenShiftUsingExtensionHttpMinimumReactiveIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionHttpMinimumReactiveIT extends HttpMinimumReactiveIT { -} \ No newline at end of file +} diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java index 6cb97b0f6f..4d94e2690b 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveI protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java index 9414689240..09d714c9f6 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/ServerlessExtensionOpenShiftHttpMinimumReactiveIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @@ -21,4 +19,4 @@ public class ServerlessExtensionOpenShiftHttpMinimumReactiveIT extends HttpMinim protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java index 189946ecc9..60df2c5f3d 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) public class OpenShiftUsingExtensionDockerBuildStrategyHttpMinimumIT extends HttpMinimumIT { -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java index d001448b4d..1e83fc484e 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/OpenShiftUsingExtensionHttpMinimumIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.http.minimum; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionHttpMinimumIT extends HttpMinimumIT { -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java index beb096a71f..8c3f89c89c 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT extend protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java index b462021742..b41514b5ae 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/ServerlessExtensionOpenShiftHttpMinimumIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @@ -20,4 +18,4 @@ public class ServerlessExtensionOpenShiftHttpMinimumIT extends HttpMinimumIT { protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftCompressionHandlerIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftCompressionHandlerIT.java index fd2b2dd997..91da619c13 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftCompressionHandlerIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftCompressionHandlerIT.java @@ -1,13 +1,11 @@ package io.quarkus.ts.http.jaxrs.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) // OCP Native coverage is not required (Test plan QUARKUS-2487), due to a lack of resources and the ROI. diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingIT.java index a6616b7e12..03c04a5181 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingIT.java @@ -1,12 +1,10 @@ package io.quarkus.ts.http.jaxrs.reactive; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftHttpCachingIT extends HttpCachingIT { diff --git a/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java b/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java index 9f04e664cb..627a99211f 100644 --- a/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java +++ b/http/vertx/src/test/java/io/quarkus/ts/vertx/OpenShiftUsingExtensionVertxIT.java @@ -1,6 +1,5 @@ package io.quarkus.ts.vertx; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.bootstrap.RestService; @@ -9,7 +8,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionVertxIT extends AbstractVertxIT { diff --git a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java index 914f8073c4..6da0b51c2c 100644 --- a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java +++ b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionDockerBuildStrategyOpenShiftVertxIT.java @@ -1,6 +1,5 @@ package io.quarkus.ts.vertx; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.bootstrap.RestService; @@ -9,7 +8,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) diff --git a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java index f698447893..fdb7acd7b0 100644 --- a/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java +++ b/http/vertx/src/test/java/io/quarkus/ts/vertx/ServerlessExtensionOpenShiftVertxIT.java @@ -1,6 +1,5 @@ package io.quarkus.ts.vertx; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.bootstrap.RestService; @@ -9,7 +8,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) diff --git a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java index 43b916d973..fc6da8fdc9 100644 --- a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java +++ b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanCountersIT.java @@ -9,7 +9,6 @@ import org.apache.http.HttpStatus; import org.hamcrest.Matchers; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -21,7 +20,6 @@ import io.quarkus.test.services.QuarkusApplication; import io.quarkus.test.utils.Command; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class OperatorOpenShiftInfinispanCountersIT extends BaseOpenShiftInfinispanIT { diff --git a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java index 55933c3fba..849c2d3012 100644 --- a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java +++ b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/OperatorOpenShiftInfinispanObjectsIT.java @@ -26,7 +26,6 @@ import io.quarkus.ts.infinispan.client.serialized.ShopItem; import io.restassured.response.Response; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class OperatorOpenShiftInfinispanObjectsIT extends BaseOpenShiftInfinispanIT { diff --git a/lifecycle-application/pom.xml b/lifecycle-application/pom.xml index aa62c04fff..da8f9d89a0 100644 --- a/lifecycle-application/pom.xml +++ b/lifecycle-application/pom.xml @@ -20,11 +20,10 @@ io.quarkus quarkus-resteasy - + io.quarkus quarkus-spring-di @@ -52,5 +51,35 @@ + + windows + + + windows + + + + + + maven-surefire-plugin + + + + false + + + + + maven-failsafe-plugin + + + + false + + + + + + diff --git a/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java b/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java index e983a5827d..9a699377e2 100644 --- a/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java +++ b/lifecycle-application/src/test/java/io/quarkus/ts/lifecycle/OpenShiftLifecycleApplicationIT.java @@ -7,13 +7,11 @@ import java.util.stream.Collectors; import org.apache.http.HttpStatus; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftLifecycleApplicationIT extends LifecycleApplicationIT { diff --git a/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java b/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java index 4ea4760f82..1029360672 100644 --- a/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java +++ b/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java @@ -12,7 +12,6 @@ import org.apache.http.HttpStatus; import org.jboss.logging.Logger; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -27,7 +26,6 @@ * - `prime_number_max_{uniqueId}`: max prime number that is found. * - `prime_number_test_{uniqueId}`: with information about the calculation of the prime number. */ -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftCustomMetricsIT { diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java index c25319ca11..af56b9bdef 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.many.extensions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) public class OpenShiftUsingExtensionDockerBuildStrategyManyExtensionsIT extends ManyExtensionsIT { -} \ No newline at end of file +} diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java index 920b5f89cc..88b516dde0 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/OpenShiftUsingExtensionManyExtensionsIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.many.extensions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) public class OpenShiftUsingExtensionManyExtensionsIT extends ManyExtensionsIT { -} \ No newline at end of file +} diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java index dc2b182369..a6af3fb992 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT ext protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +} diff --git a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java index accf890f29..e204a8938f 100644 --- a/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java +++ b/super-size/many-extensions/src/test/java/io/quarkus/ts/many/extensions/ServerlessExtensionOpenShiftManyExtensionsIT.java @@ -2,14 +2,12 @@ import static io.restassured.RestAssured.given; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy; import io.quarkus.test.scenarios.OpenShiftScenario; import io.restassured.specification.RequestSpecification; -@Disabled("https://github.com/quarkusio/quarkus/issues/31228") @Tag("use-quarkus-openshift-extension") @Tag("serverless") @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension) @@ -21,4 +19,4 @@ public class ServerlessExtensionOpenShiftManyExtensionsIT extends ManyExtensions protected RequestSpecification givenSpec() { return HTTPS_CLIENT_SPEC; } -} \ No newline at end of file +}