From 9ada77feb71747aa244802ea554a51c97c5c12a7 Mon Sep 17 00:00:00 2001
From: Kabir Khan <kkhan@redhat.com>
Date: Fri, 22 Dec 2023 10:14:51 +0000
Subject: [PATCH] More CI tweaks for bootable jar

---
 .github/workflows/glow_ci.yml                | 2 +-
 .github/workflows/glow_ci_internal_tests.yml | 4 ++--
 .github/workflows/quickstart_ci.yml          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/glow_ci.yml b/.github/workflows/glow_ci.yml
index 4f0db6905a..60d83cb870 100644
--- a/.github/workflows/glow_ci.yml
+++ b/.github/workflows/glow_ci.yml
@@ -6,7 +6,7 @@ on:
       - port-to-glow
 
 env:
-  WILDFLY_VERSION: 30.0.0.Final
+  WILDFLY_VERSION: 31.0.0.Beta1
 
 # Only run the latest job
 concurrency:
diff --git a/.github/workflows/glow_ci_internal_tests.yml b/.github/workflows/glow_ci_internal_tests.yml
index 9df7923bf8..b5149ec37c 100644
--- a/.github/workflows/glow_ci_internal_tests.yml
+++ b/.github/workflows/glow_ci_internal_tests.yml
@@ -85,11 +85,11 @@ jobs:
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
           fi
           # mvn -B -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
-          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar
+          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar &
           # Sleep to wait for server to start (we should have a wait)
           sleep 20
           mvn -B verify -Pintegration-testing -Dserver.host=http://localhost:8080
-          mvn -B -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
         shell: bash
       - name: Run after script
         run: |
diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
index 01db5bb76d..efbca5a022 100644
--- a/.github/workflows/quickstart_ci.yml
+++ b/.github/workflows/quickstart_ci.yml
@@ -124,13 +124,13 @@ jobs:
           mvn -fae clean package -Pbootable-jar
           echo "Starting bootable jar..."
           # mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
-          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar
+          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar &
           # Sleep to wait for server to start (we should have a wait)
           sleep 20
           echo "Testing bootable jar..."
           mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
           echo "Shutting down bootable jar..."          
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
         shell: bash
       - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile
         if: ${{ inputs.TEST_OPENSHIFT }}
@@ -234,13 +234,13 @@ jobs:
           mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Starting bootable jar..."
           #mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120
-          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar
+          java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar &
           # Sleep to wait for server to start (we should have a wait)
           sleep 20
           echo "Testing bootable jar..."
           mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
           echo "Shutting down bootable jar..."          
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
         shell: bash
       - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile, and built Server version
         if: ${{ inputs.TEST_OPENSHIFT }}