Skip to content

Commit

Permalink
Merge pull request wildfly#17854 from bstansberry/WFLY-19267_bootable
Browse files Browse the repository at this point in the history 
[WFLY-19267] Support running the bootable jar WildFly testsuite against bootable jars provisioned with the 'latest standard channels'
  • Loading branch information
@bstansberry
bstansberry authored Apr 29, 2024
2 parents 17194cc + d02490c commit 2b10373
Show file tree
Hide file tree
Showing 20 changed files with 112 additions and 208 deletions.
35 changes: 5 additions & 30 deletions testsuite/integration/basic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
<surefire.forked.process.timeout>3600</surefire.forked.process.timeout>
<!-- properties to enable bootable phases -->
<bootable-jar-maven-jar-plugin.create.modules.phase>none</bootable-jar-maven-jar-plugin.create.modules.phase>
<bootable-jar-jpa-packaging.phase>none</bootable-jar-jpa-packaging.phase>
<bootable-jar-cloud-profile-packaging.phase>none</bootable-jar-cloud-profile-packaging.phase>
<bootable-jar-copy-module-files.phase>none</bootable-jar-copy-module-files.phase>
<glow.cloud-profile.phase>none</glow.cloud-profile.phase>
<glow.jdr.phase>none</glow.jdr.phase>
Expand Down Expand Up @@ -1430,28 +1428,15 @@
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<version>${version.org.wildfly.jar.plugin}</version>
<executions>
<!-- Package a cloud-profile server -->
<!-- Package a cloud-profile server with the default 'bootable-jar-packaging' execution -->
<execution>
<id>bootable-jar-cloud-profile-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>${bootable-jar-cloud-profile-packaging.phase}</phase>
<id>bootable-jar-packaging</id>
<configuration>
<output-file-name>test-wildfly-cloud-profile.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<extra-server-content-dirs>
<extraServerContent>${project.build.directory}/extraContent/</extraServerContent>
</extra-server-content-dirs>
<offline>true</offline>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<provisioning-file>target/glow-scan/microprofile.surefire/provisioning.xml</provisioning-file>
</configuration>
</execution>
Expand All @@ -1462,20 +1447,12 @@
<goals>
<goal>package</goal>
</goals>
<phase>${bootable-jar-jpa-packaging.phase}</phase>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-jpa.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<extra-server-content-dirs>
<extraServerContent>${project.build.directory}/extraContent/</extraServerContent>
</extra-server-content-dirs>
<offline>true</offline>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<provisioning-file>target/glow-scan/jpa-layers.surefire/provisioning.xml</provisioning-file>
</configuration>
</execution>
Expand Down Expand Up @@ -3292,8 +3269,7 @@
<properties>
<bootable-jar-copy-module-files.phase>test-compile</bootable-jar-copy-module-files.phase>
<bootable-jar-maven-jar-plugin.create.modules.phase>test-compile</bootable-jar-maven-jar-plugin.create.modules.phase>
<bootable-jar-jpa-packaging.phase>test-compile</bootable-jar-jpa-packaging.phase>
<bootable-jar-cloud-profile-packaging.phase>test-compile</bootable-jar-cloud-profile-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<glow.cloud-profile.phase>test-compile</glow.cloud-profile.phase>
<glow.jpa.phase>test-compile</glow.jpa.phase>
</properties>
Expand Down Expand Up @@ -3453,8 +3429,7 @@
<properties>
<bootable-jar-copy-module-files.phase>test-compile</bootable-jar-copy-module-files.phase>
<bootable-jar-maven-jar-plugin.create.modules.phase>test-compile</bootable-jar-maven-jar-plugin.create.modules.phase>
<bootable-jar-jpa-packaging.phase>test-compile</bootable-jar-jpa-packaging.phase>
<bootable-jar-cloud-profile-packaging.phase>test-compile</bootable-jar-cloud-profile-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<glow.cloud-profile.phase>test-compile</glow.cloud-profile.phase>
<glow.jpa.phase>test-compile</glow.jpa.phase>
<extra.server.jvm.args>-Dmaven.repo.local=${settings.localRepository}</extra.server.jvm.args>
Expand Down
47 changes: 6 additions & 41 deletions testsuite/integration/clustering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
<version.org.infinispan.server.driver>${version.org.infinispan}</version.org.infinispan.server.driver>
<ts.surefire.clustering.ha.additionalExcludes>nothing-by-default</ts.surefire.clustering.ha.additionalExcludes>
<!-- properties to enable plugins shared by various bootable jar executions -->
<bootable-jar-cloud-profile-packaging.phase>none</bootable-jar-cloud-profile-packaging.phase>
<bootable-jar-load-balancer-packaging.phase>none</bootable-jar-load-balancer-packaging.phase>
<glow.phase>none</glow.phase>
<ts.config-as.configure-wildfly.phase>process-test-resources</ts.config-as.configure-wildfly.phase>
<ts.config-as.configure-lb.phase>generate-test-resources</ts.config-as.configure-lb.phase>
Expand Down Expand Up @@ -510,27 +508,14 @@
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<version>${version.org.wildfly.jar.plugin}</version>
<executions>
<!-- Package a cloud-profile server -->
<!-- Package a cloud-profile server with the default 'bootable-jar-packaging' execution -->
<execution>
<id>bootable-jar-cloud-profile-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>${bootable-jar-cloud-profile-packaging.phase}</phase>
<id>bootable-jar-packaging</id>
<configuration>
<output-file-name>test-wildfly-cloud-profile.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<!-- content that is installed in wildfly home -->
<extra-server-content-dirs>${wildfly.dir}</extra-server-content-dirs>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<cli-sessions>
<cli-session>
<script-files>
Expand All @@ -548,17 +533,9 @@
<goals>
<goal>package</goal>
</goals>
<phase>${bootable-jar-jpa-distributed-packaging.phase}</phase>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-jpa-distributed.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<cli-sessions>
<cli-session>
<script-files>
Expand All @@ -576,17 +553,9 @@
<goals>
<goal>package</goal>
</goals>
<phase>${bootable-jar-load-balancer-packaging.phase}</phase>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<output-file-name>test-wildfly-cloud-profile-load-balancer.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<cli-sessions>
<cli-session>
<script-files>
Expand Down Expand Up @@ -2675,9 +2644,7 @@
</dependency>
</dependencies>
<properties>
<bootable-jar-cloud-profile-packaging.phase>test-compile</bootable-jar-cloud-profile-packaging.phase>
<bootable-jar-jpa-distributed-packaging.phase>test-compile</bootable-jar-jpa-distributed-packaging.phase>
<bootable-jar-load-balancer-packaging.phase>test-compile</bootable-jar-load-balancer-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<extra.server.jvm.args>-Dmaven.repo.local=${settings.localRepository}</extra.server.jvm.args>
<glow.phase>test-compile</glow.phase>
<ts.config-as.configure-wildfly.phase>none</ts.config-as.configure-wildfly.phase>
Expand Down Expand Up @@ -2805,9 +2772,7 @@
</dependency>
</dependencies>
<properties>
<bootable-jar-cloud-profile-packaging.phase>test-compile</bootable-jar-cloud-profile-packaging.phase>
<bootable-jar-jpa-distributed-packaging.phase>test-compile</bootable-jar-jpa-distributed-packaging.phase>
<bootable-jar-load-balancer-packaging.phase>test-compile</bootable-jar-load-balancer-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<glow.phase>test-compile</glow.phase>
<extra.server.jvm.args>-Dmaven.repo.local=${settings.localRepository}</extra.server.jvm.args>
</properties>
Expand Down
17 changes: 3 additions & 14 deletions testsuite/integration/elytron-oidc-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
<jbossas.ts.dir>${jbossas.ts.integ.dir}/..</jbossas.ts.dir>
<jbossas.project.dir>${jbossas.ts.dir}/..</jbossas.project.dir>
<surefire.forked.process.timeout>3600</surefire.forked.process.timeout>
<!-- properties to enable plugins shared by various bootable jar executions -->
<bootable-jar-packaging.phase>none</bootable-jar-packaging.phase>
<glow.phase>none</glow.phase>
</properties>

Expand Down Expand Up @@ -180,27 +178,18 @@
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<version>${version.org.wildfly.jar.plugin}</version>
<executions>
<!-- Provision a cloud server -->
<execution>
<id>bootable-jar-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>${bootable-jar-packaging.phase}</phase>
<phase>${ts.bootable-jar-packaging.phase}</phase>
<configuration>
<!-- content that is installed in wildfly home -->
<extra-server-content-dirs>${wildfly.dir}</extra-server-content-dirs>
<output-file-name>test-wildfly.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<provisioning-file>target/glow-scan/provisioning.xml</provisioning-file>
</configuration>
</execution>
Expand Down Expand Up @@ -543,7 +532,7 @@
</dependency>
</dependencies>
<properties>
<bootable-jar-packaging.phase>test-compile</bootable-jar-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<glow.phase>test-compile</glow.phase>
</properties>
<build>
Expand Down Expand Up @@ -629,7 +618,7 @@
</dependency>
</dependencies>
<properties>
<bootable-jar-packaging.phase>test-compile</bootable-jar-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<glow.phase>test-compile</glow.phase>
<extra.server.jvm.args>-Dmaven.repo.local=${settings.localRepository}</extra.server.jvm.args>
</properties>
Expand Down
16 changes: 3 additions & 13 deletions testsuite/integration/elytron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,9 @@
<name>ts.bootable</name>
</property>
</activation>
<properties>
<ts.bootable-jar-packaging.phase>process-test-classes</ts.bootable-jar-packaging.phase>
</properties>
<dependencies>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
Expand Down Expand Up @@ -939,27 +942,14 @@
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<version>${version.org.wildfly.jar.plugin}</version>
<executions>
<!-- Provision a server with the core functionality we will provide in OpenShift images -->
<execution>
<id>bootable-jar-packaging</id>
<goals>
<goal>package</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<output-file-name>test-wildfly.jar</output-file-name>
<hollowJar>true</hollowJar>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<!-- content that is installed in wildfly home -->
<extra-server-content-dirs>${wildfly.dir}</extra-server-content-dirs>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
<cli-sessions>
<cli-session>
<script-files>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/integration/microprofile-tck/config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<properties>
<!-- Enable bootable jar packaging -->
<ts.microprofile-tck-glow.phase>test-compile</ts.microprofile-tck-glow.phase>
<ts.bootable-jar-microprofile-tck-packaging.phase>test-compile</ts.bootable-jar-microprofile-tck-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<ts.microprofile-tck-glow.config.name>standalone.xml</ts.microprofile-tck-glow.config.name>
<!-- Disable 'configure-weld-subsystem' since that is for a standalone server -->
<config.configure-weld-subsystem.phase>none</config.configure-weld-subsystem.phase>
Expand All @@ -175,7 +175,7 @@
<artifactId>wildfly-jar-maven-plugin</artifactId>
<executions>
<execution>
<id>bootable-jar-microprofile-tck-packaging</id>
<id>bootable-jar-packaging</id>
<configuration>
<cli-sessions>
<cli-session>
Expand All @@ -202,7 +202,7 @@
<properties>
<!-- Enable bootable jar packaging -->
<ts.microprofile-tck-glow.phase>test-compile</ts.microprofile-tck-glow.phase>
<ts.bootable-jar-microprofile-tck-packaging.phase>test-compile</ts.bootable-jar-microprofile-tck-packaging.phase>
<ts.bootable-jar-packaging.phase>test-compile</ts.bootable-jar-packaging.phase>
<ts.microprofile-tck-glow.config.name>standalone.xml</ts.microprofile-tck-glow.config.name>
<!-- Disable 'configure-weld-subsystem' since that is for a standalone server -->
<config.configure-weld-subsystem.phase>none</config.configure-weld-subsystem.phase>
Expand All @@ -214,7 +214,7 @@
<artifactId>wildfly-jar-maven-plugin</artifactId>
<executions>
<execution>
<id>bootable-jar-microprofile-tck-packaging</id>
<id>bootable-jar-packaging</id>
<configuration>
<cli-sessions>
<cli-session>
Expand Down
Loading

0 comments on commit 2b10373

Please sign in to comment.