Skip to content

Commit

Permalink
[JBWS-4323]:Improve the wildfly version and profile to avoid to chang…
Browse files Browse the repository at this point in the history
…e CI script for each WFLY major version
  • Loading branch information
jimma committed Jan 12, 2023
1 parent 01bea66 commit a1339ba
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest ]
java: ['11','17']
wildfly-version: ['wildfly28dev', 'wildfly2700']
wildfly-version: ['wildflydev', 'wildfly']

steps:
- name: Checkout jbossws-cxf
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Build docbook
run: mvn -s ./.m2-settings.xml -f docbook/pom.xml install
- name: Build WFLY
if: ${{ matrix.wildfly-version == 'wildfly28dev'}}
if: ${{ matrix.wildfly-version == 'wildflydev'}}
working-directory: ./wildfly
run: mvn -s ../.m2-settings.xml -DskipTests=true '-Denforcer.skip=true' -Prelease clean install
- name: Build with Maven Java ${{ matrix.java }} on WildFly ${{ matrix.wildfly-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wildfly-build.yml
Expand Up @@ -33,7 +33,7 @@ jobs:
repository: jbossws/jbossws-cxf
- name: Build with Maven Java ${{ matrix.java }} on WildFly ${{needs.wildfly-build.outputs.wildfly-version}}
run: |
mvn -s ./.m2-settings.xml -B -V -fae -Pwildfly28dev clean install
mvn -s ./.m2-settings.xml -B -V -fae -Pwildflydev clean install
- name: Upload surefire reports
uses: actions/upload-artifact@v2
if: failure()
Expand Down
16 changes: 8 additions & 8 deletions README.md
@@ -1,15 +1,15 @@
# JBossWS-CXF

[![Build Status](https://api.travis-ci.org/jbossws/jbossws-cxf.svg?branch=master)](https://api.travis-ci.org/jbossws/jbossws-cxf.svg?branch=master)
[![Build Status](https://github.com/jbossws/jbossws-cxf/actions/workflows/maven.yml/badge.svg)](https://github.com/jbossws/jbossws-cxf/actions/workflows/maven.yml/badge.svg)

Building and running the testsuite
------------------------------------

Building and running the testsuite requires Maven version 3.2.2 or higher.

The build follows the usual Maven flow; a `wildflyXYZ` profile has to be specified to tell the project which target container to use for integration tests; if no `wildflyXYZ` profile is specified, the integration tests are skipped.
The build follows the usual Maven flow; a `wildfly` or 'wildflydev' profile has to be specified to tell the project which target container to use for integration tests; if no `wildfly` profile is specified, the integration tests are skipped.
```
mvn -PwildflyXYZ integration-test
mvn -Pwildfly integration-test
```
* The `-Dserver.home=/foo/bar` option can be used to run the testsuite against a given local server instance; the server must not be already running, as the build will create various standalone server configurations and start multiple instances.
* The `-Dexclude-udp-tests` option can be used to skip UDP tests; that might be needed when running on a network that does not allow UDP broadcast.
Expand All @@ -27,20 +27,20 @@ mvn -PwildflyXYZ integration-test

The `fast` profile can also be used to run tests concurrently; run following command in such case to trigger test servers' shutdown and save memory at the end of each testsuite module:
```
mvn -Pfast,wildflyXYZ post-integration-test
mvn -Pfast,wildfly post-integration-test
```

Updating WS stack
-------------------

In some cases it might be needed to build the ws stack and install it on a specified server instance without running the integration testsuite; this is achieved as follows:
```
mvn -PwildflyXYZ -Dserver.home=/foo/bar package
mvn -Pwildfly -Dserver.home=/foo/bar package
```
If a `server.home` property is not provided, the build creates a zip archive with a vanilla WildFly server patched with the current WS stack:

```
mvn -PwildflyXYZ package
mvn -Pwildfly package
```
the zip file path is modules/dist/target/jbossws-cxf-dist-${project.version}-test-server.zip

Expand All @@ -58,9 +58,9 @@ mvn -Pdist,testsuite clean

Releases are performed using the Maven Release Plugin; no manual modification of artifact versions in pom.xml files is hence required. The release is tagged with the following command:
```
mvn -Pwildfly2000 release:prepare
mvn -Pwildfly release:prepare
```
where `wildfly2000` is one of the supported target containers (preferably not the current WildFly master version).
where `wildfly` is the latest target containers and it is the latest official WFLY release.

The release tag can then be checked out, built and deployed to the nexus repository.
To clean the release plugin data (in case of errors), run:
Expand Down
4 changes: 2 additions & 2 deletions modules/testsuite/pom.xml
Expand Up @@ -579,7 +579,7 @@
Descr: WildFly-27.0.0 specific options
-->
<profile>
<id>wildfly2700</id>
<id>wildfly</id>
<properties>
<jboss.remoting.protocol>remote+http</jboss.remoting.protocol>
<jboss.initial.context.factory>org.wildfly.naming.client.WildFlyInitialContextFactory</jboss.initial.context.factory>
Expand Down Expand Up @@ -680,7 +680,7 @@
Descr: Test with the latest WFLY28 upstream version
-->
<profile>
<id>wildfly28dev</id>
<id>wildflydev</id>
<properties>
<jboss.remoting.protocol>remote+http</jboss.remoting.protocol>
<jboss.initial.context.factory>org.wildfly.naming.client.WildFlyInitialContextFactory</jboss.initial.context.factory>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -1067,7 +1067,7 @@
Name: wildfly2700
Descr: WildFly-27.0.0 specific options -->
<profile>
<id>wildfly2700</id>
<id>wildfly</id>
<properties>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly2700.version}</jboss.version>
Expand All @@ -1082,7 +1082,7 @@
Name: wildfly28dev
Descr: Test with WFLY28 upstream version -->
<profile>
<id>wildfly28dev</id>
<id>wildflydev</id>
<properties>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly28dev.version}</jboss.version>
Expand Down

0 comments on commit a1339ba

Please sign in to comment.