diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml index 44ab2509f2..587a1ee4e9 100644 --- a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml +++ b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml @@ -21,7 +21,7 @@ env: MATRIX_OS: '"ubuntu-latest"' SERVER_PROVISIONING_SERVER_HOST: 'http://localhost' EXTRA_RUN_ARGS: '-Pprovisioned-server -DpostgresqlUsername="test" -DpostgresqlPassword="test"' - + WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS: '-Dwildfly-glow-galleon-feature-packs-url=https://raw.githubusercontent.com/wildfly/wildfly-galleon-feature-packs/main/' jobs: Matrix-Setup: runs-on: ubuntu-latest @@ -108,9 +108,9 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client - mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" + mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" cd ../server - mvn -fae clean package -Popenshift -DpostgresqlUsername="test" -DpostgresqlPassword="test" + mvn -fae clean package -Popenshift shell: bash - name: Run after script env: @@ -176,7 +176,7 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }} - mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS}} shell: bash - name: Build, run & test ${{ env.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version if: ${{ env.TEST_PROVISIONED_SERVER }} @@ -184,12 +184,12 @@ jobs: cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client echo "Building 'client' provisioned server..." - mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS}} mvn wildfly:start -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} cd ../server echo "Building 'server' provisioned server..." - mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS}} + mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS}} echo "Add quickstartUser to both 'server' builds..." ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' @@ -217,9 +217,9 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client - mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS}} cd ../server - mvn -fae clean package -Popenshift -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS}} shell: bash - name: Run after script env: