Skip to content

Commit

Permalink
Issue #5644 Remove all profiles for session tests (#5703)
Browse files Browse the repository at this point in the history 
* remote session tests are now executed per default, new profile to exclude then no-remote-session-tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove this no-remote-session-tests profile just use skipTests to skip that

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
  • Loading branch information
@olamy
olamy committed Nov 23, 2020
1 parent fe65023 commit 429bec5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 144 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pipeline {
steps {
container('jetty-build') {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk8", "clean install -T3 -Premote-session-tests -Pgcloud", "maven3",
mavenBuild( "jdk8", "clean install -T3", "maven3",
[[parserName: 'Maven'], [parserName: 'Java']])
// Collect up the jacoco execution results (only on main build)
jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
Expand Down Expand Up @@ -42,7 +42,7 @@ pipeline {
steps {
container( 'jetty-build' ) {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk11", "clean install -T3 -Djacoco.skip=true -Premote-session-tests -Pgcloud", "maven3",
mavenBuild( "jdk11", "clean install -T3 -Djacoco.skip=true", "maven3",
[[parserName: 'Maven'], [parserName: 'Java']])
}
}
Expand All @@ -54,7 +54,7 @@ pipeline {
steps {
container( 'jetty-build' ) {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk15", "clean install -T3 -Djacoco.skip=true -Premote-session-tests -Pgcloud", "maven3",
mavenBuild( "jdk15", "clean install -T3 -Djacoco.skip=true", "maven3",
[[parserName: 'Maven'], [parserName: 'Java']])
}
}
Expand Down
30 changes: 4 additions & 26 deletions jetty-infinispan/infinispan-remote-query/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
<skipTests>false</skipTests>
<systemPropertyVariables>
<infinispan.docker.image.version>${infinispan.docker.image.version}</infinispan.docker.image.version>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -137,29 +140,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>remote-session-tests</id>
<activation>
<property>
<name>hotrod.enabled</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>false</skipTests>
<systemPropertyVariables>
<infinispan.docker.image.version>${infinispan.docker.image.version}</infinispan.docker.image.version>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
29 changes: 0 additions & 29 deletions tests/test-sessions/test-gcloud-sessions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down Expand Up @@ -83,26 +76,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>gcloud</id>
<activation>
<property>
<name>gcloud.enabled</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>false</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 5 additions & 30 deletions tests/test-sessions/test-infinispan-sessions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>org/eclipse/jetty/server/session/*.java</include>
<include>**/*.java</include>
</includes>
<systemPropertyVariables>
<infinispan.docker.image.version>${infinispan.docker.image.version}</infinispan.docker.image.version>
<infinispan.docker.image.name>${infinispan.docker.image.name}</infinispan.docker.image.name>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -151,33 +155,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- to test hotrod, configure a cache called "remote-session-test" -->
<profile>
<id>remote-session-tests</id>
<activation>
<property>
<name>hotrod.enabled</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*.java</include>
</includes>
<systemPropertyVariables>
<infinispan.docker.image.version>${infinispan.docker.image.version}</infinispan.docker.image.version>
<infinispan.docker.image.name>${infinispan.docker.image.name}</infinispan.docker.image.name>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
30 changes: 0 additions & 30 deletions tests/test-sessions/test-memcached-sessions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down Expand Up @@ -78,27 +71,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>remote-session-tests</id>
<activation>
<property>
<name>memcached.enabled</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>false</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
29 changes: 3 additions & 26 deletions tests/test-sessions/test-mongodb-sessions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
<systemPropertyVariables>
<mongo.docker.version>${mongo.docker.version}</mongo.docker.version>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -112,29 +114,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>remote-session-tests</id>
<activation>
<property>
<name>mongo.enabled</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<mongo.docker.version>${mongo.docker.version}</mongo.docker.version>
</systemPropertyVariables>
<skipTests>false</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit 429bec5

Please sign in to comment.