Skip to content

Commit

Permalink
Merge pull request #1384 from michalvavrik/feature/let-fw-disable-tes…
Browse files Browse the repository at this point in the history 
…ts-when-docker-out

Support running tests with Docker on Windows when Linux containers are available
  • Loading branch information
@mjurc
mjurc committed Aug 30, 2023
2 parents 1264527 + 6b10b4f commit 166101d
Show file tree
Hide file tree
Showing 71 changed files with 12 additions and 1,561 deletions.
25 changes: 0 additions & 25 deletions build-time-analytics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,5 @@
<quarkus.build.skip>true</quarkus.build.skip>
</properties>
</profile>
<!-- Skipped on Windows as CLI is not installed in Windows yet -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
3 changes: 3 additions & 0 deletions build-time-analytics/src/test/java/io/quarkus/ts/buildtimeanalytics/DevModeIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;

import io.quarkus.test.bootstrap.QuarkusCliRestService;
import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;

@DisabledOnOs(OS.WINDOWS) // TODO mvavrik: must only run when Quarkus CLI and Docker are available
@Tag("QUARKUS-2812")
@Tag("quarkus-cli")
@QuarkusScenario
Expand Down
3 changes: 3 additions & 0 deletions build-time-analytics/src/test/java/io/quarkus/ts/buildtimeanalytics/ProdModeJvmIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;

import io.quarkus.test.bootstrap.QuarkusCliClient.Result;
import io.quarkus.test.bootstrap.QuarkusCliRestService;
import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.test.scenarios.annotations.DisabledOnNative;

@DisabledOnOs(OS.WINDOWS) // TODO mvavrik: must only run when Quarkus CLI is available
@Tag("QUARKUS-2812")
@Tag("quarkus-cli")
@QuarkusScenario
Expand Down
25 changes: 0 additions & 25 deletions http/graphql-telemetry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,5 @@
</dependency>
</dependencies>
</profile>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
27 changes: 0 additions & 27 deletions http/http-advanced-reactive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,31 +86,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
27 changes: 0 additions & 27 deletions http/http-advanced/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,31 +95,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
3 changes: 0 additions & 3 deletions ...ctive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientProxyIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import org.apache.http.HttpStatus;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;

import io.quarkus.test.bootstrap.RestService;
import io.quarkus.test.scenarios.QuarkusScenario;
Expand All @@ -15,7 +13,6 @@
import io.restassured.response.Response;

@QuarkusScenario
@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support Linux Containers / Testcontainers")
public class ReactiveRestClientProxyIT {
private static final String USER = "proxyuser";
private static final String PASSWORD = "proxypassword";
Expand Down
27 changes: 0 additions & 27 deletions http/vertx-web-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
3 changes: 0 additions & 3 deletions ...e-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/OpenAPITracingIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import org.apache.http.HttpStatus;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;

import io.quarkus.test.bootstrap.JaegerService;
import io.quarkus.test.bootstrap.RestService;
Expand All @@ -19,7 +17,6 @@
import io.restassured.response.Response;

@QuarkusScenario
@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support Linux Containers / Testcontainers")
public class OpenAPITracingIT {

private static final String SUPPRESS_NON_APPLICATION_URIS = "quarkus.otel.traces.suppress-non-application-uris";
Expand Down
30 changes: 0 additions & 30 deletions lifecycle-application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,5 @@
</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>
27 changes: 0 additions & 27 deletions messaging/amqp-reactive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
27 changes: 0 additions & 27 deletions messaging/cloud-events/amqp-binary/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
27 changes: 0 additions & 27 deletions messaging/cloud-events/amqp-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
27 changes: 0 additions & 27 deletions messaging/infinispan-grpc-kafka/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,4 @@
</plugin>
</plugins>
</build>
<profiles>
<!-- Skipped on Windows as does not support Linux Containers / Testcontainers -->
<profile>
<id>skip-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit 166101d

Please sign in to comment.