Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable tests with Quarkus OpenShift extension as upstream issue is fixed #1106

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import io.quarkus.test.services.knative.eventing.spi.ForwardResponseDTO;
import io.restassured.common.mapper.TypeRef;

@Disabled("https://github.com/quarkusio/quarkus/issues/31228")
@Disabled("Disabled as flaky") // TODO mvavrik: investigate why the test is flaky
@Tag("use-quarkus-openshift-extension")
@Tag("serverless")
@OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension)
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

}
}
Original file line number Diff line number Diff line change
@@ -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 {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumReactiveI
protected RequestSpecification givenSpec() {
return HTTPS_CLIENT_SPEC;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -21,4 +19,4 @@ public class ServerlessExtensionOpenShiftHttpMinimumReactiveIT extends HttpMinim
protected RequestSpecification givenSpec() {
return HTTPS_CLIENT_SPEC;
}
}
}
Original file line number Diff line number Diff line change
@@ -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 {

}
}
Original file line number Diff line number Diff line change
@@ -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 {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftHttpMinimumIT extend
protected RequestSpecification givenSpec() {
return HTTPS_CLIENT_SPEC;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -20,4 +18,4 @@ public class ServerlessExtensionOpenShiftHttpMinimumIT extends HttpMinimumIT {
protected RequestSpecification givenSpec() {
return HTTPS_CLIENT_SPEC;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package io.quarkus.ts.http.jakartarest.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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.quarkus.ts.http.jakartarest.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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import io.quarkus.test.services.QuarkusApplication;
import io.quarkus.test.utils.Command;

@Disabled("https://github.com/quarkusio/quarkus/issues/31228")
// TODO mvavrik: investigate and enable test!
@Disabled("fails over incorrect response status, mvavrik will investigate in week 14")
@OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class OperatorOpenShiftInfinispanCountersIT extends BaseOpenShiftInfinispanIT {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
33 changes: 31 additions & 2 deletions lifecycle-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy</artifactId>
</dependency>
<!-- TODO "https://github.com/quarkusio/quarkus/issues/31228"
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-openshift</artifactId>
</dependency>-->
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-spring-di</artifactId>
Expand Down Expand Up @@ -52,5 +51,35 @@
</repository>
</repositories>
</profile>
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
<!-- disable Dev Services for Kubernetes on Windows due to Docker limitations -->
<quarkus.kubernetes-client.devservices.enabled>false</quarkus.kubernetes-client.devservices.enabled>
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<!-- disable Dev Services for Kubernetes on Windows due to Docker limitations -->
<quarkus.kubernetes-client.devservices.enabled>false</quarkus.kubernetes-client.devservices.enabled>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy;
import io.quarkus.test.scenarios.OpenShiftScenario;

@Disabled("https://github.com/quarkusio/quarkus/issues/31228")
@Disabled("https://github.com/quarkusio/quarkus/issues/29451")
@OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension)
public class OpenShiftLifecycleApplicationIT extends LifecycleApplicationIT {

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<profile.id>jvm</profile.id>
<!-- S2i configuration -->
<ts.global.s2i.quarkus.jvm.builder.image>registry.access.redhat.com/ubi8/openjdk-11:latest</ts.global.s2i.quarkus.jvm.builder.image>
<ts.global.s2i.quarkus.native.builder.image>quay.io/quarkus/ubi-quarkus-native-s2i:22.2-java17</ts.global.s2i.quarkus.native.builder.image>
<ts.global.s2i.quarkus.native.builder.image>quay.io/quarkus/ubi-quarkus-graalvmce-s2i:22.3-java17</ts.global.s2i.quarkus.native.builder.image>
<!-- Default values for format -->
<src.format.goal>format</src.format.goal>
<src.sort.goal>sort</src.sort.goal>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

}
}
Original file line number Diff line number Diff line change
@@ -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 {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -20,4 +18,4 @@ public class ServerlessExtensionDockerBuildStrategyOpenShiftManyExtensionsIT ext
protected RequestSpecification givenSpec() {
return HTTPS_CLIENT_SPEC;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -21,4 +19,4 @@ public class ServerlessExtensionOpenShiftManyExtensionsIT extends ManyExtensions
protected RequestSpecification givenSpec() {
return HTTPS_CLIENT_SPEC;
}
}
}
Loading