Skip to content

Commit 59d1008

Browse files
emmartinsemmartins
committed
[WFLY-20180] aligns ejb-txn-remote-call CI and README provisioned server testing instructions
1 parent 75d24ed commit 59d1008

File tree

2 files changed

+16
-25
lines changed

2 files changed

+16
-25
lines changed

‎.github/workflows/quickstart_ejb-txn-remote-call_ci.yml

+14-23
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ env:
1919
TEST_OPENSHIFT: true
2020
MATRIX_JDK: '"17"'
2121
MATRIX_OS: '"ubuntu-latest"'
22-
SERVER_PROVISIONING_SERVER_HOST: 'http://localhost'
23-
EXTRA_RUN_ARGS: '-DpostgresqlUsername="test" -DpostgresqlPassword="test"'
2422
jobs:
2523
Matrix-Setup:
2624
runs-on: ubuntu-latest
@@ -75,26 +73,23 @@ jobs:
7573
cd ${{ env.QUICKSTART_PATH }}/client
7674
echo "Building 'client' provisioned server..."
7775
mvn -fae clean package -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test"
78-
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
76+
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120
7977
cd ../server
8078
echo "Building 'server' provisioned server..."
8179
mvn -fae clean package -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test"
8280
mvn -fae package -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test"
8381
echo "Add quickstartUser to both 'server' builds..."
84-
./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
85-
./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
86-
echo "Add quickstartAdmin to both 'server' builds..."
87-
./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
88-
./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
82+
./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
83+
./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
8984
echo "Starting provisioned server..."
90-
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
91-
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
85+
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120
86+
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120
9287
echo "Testing provisioned server..."
9388
cd ../client
9489
mvn -fae verify -Pintegration-testing
9590
cd ../server
96-
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing
97-
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing
91+
mvn -fae verify -Dserver.host="http://localhost:8180" -Pintegration-testing
92+
mvn -fae verify -Dserver.host="http://localhost:8280" -Pintegration-testing
9893
echo "Shutting down provisioned server..."
9994
cd ../client
10095
mvn wildfly:shutdown
@@ -184,27 +179,23 @@ jobs:
184179
cd ${{ env.QUICKSTART_PATH }}/client
185180
echo "Building 'client' provisioned server..."
186181
mvn -fae clean package -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
187-
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
182+
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
188183
cd ../server
189184
echo "Building 'server' provisioned server..."
190185
mvn -fae clean package -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
191186
mvn -fae package -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
192187
echo "Add quickstartUser to both 'server' builds..."
193-
./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
194-
./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
195-
echo "Add quickstartAdmin to both 'server' builds..."
196-
./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
197-
./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
188+
./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
189+
./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
198190
echo "Starting provisioned server..."
199-
200-
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
201-
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
191+
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
192+
mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
202193
echo "Testing provisioned server..."
203194
cd ../client
204195
mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
205196
cd ../server
206-
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
207-
mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
197+
mvn -fae verify -Dserver.host="http://localhost:8180" -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
198+
mvn -fae verify -Dserver.host="http://localhost:8280" -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
208199
echo "Shutting down provisioned server..."
209200
cd ../client
210201
mvn wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}

‎ejb-txn-remote-call/README-source.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -648,13 +648,13 @@ mvn verify -Pintegration-testing
648648
[source,subs="attributes+",options="nowrap"]
649649
----
650650
cd ${PATH_TO_QUICKSTART_DIR}/server;
651-
mvn verify -Pintegration-testing -Dserver.host="http://localhost:8180/server"
651+
mvn verify -Pintegration-testing -Dserver.host="http://localhost:8180"
652652
----
653653
+
654654
[source,subs="attributes+",options="nowrap"]
655655
----
656656
cd ${PATH_TO_QUICKSTART_DIR}/server;
657-
mvn verify -Pintegration-testing -Dserver.host="http://localhost:8280/server"
657+
mvn verify -Pintegration-testing -Dserver.host="http://localhost:8280"
658658
----
659659

660660
. To shut down the {productName} provisioned servers using the {productName} Maven Plugin:

0 commit comments

Comments
 (0)