Fix bootable jar plugin usage

Temporarily add sleep until we have plugin handling waiting
wildfly · Dec 22, 2023 · d62b1e7 · d62b1e7
1 parent 35942d3
commit d62b1e7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/glow_ci_internal.yml b/.github/workflows/glow_ci_internal.yml
@@ -32,12 +32,12 @@ jobs:
       QUICKSTART_PATH: ${{inputs.QUICKSTART_PATH}}
       DEPLOYMENT_DIR: ${{inputs.DEPLOYMENT_DIR}}
       PROFILE: 'provisioned-server'
-#  # Skip bootable jar until the plugin implements GLow support for bootable jar
-#  bootable-jar:
-#    name: Openshift ${{inputs.QUICKSTART_PATH}}
-#    if: ${{ contains(inputs.PROFILES, 'bootable-jar') }}
-#    uses: ./.github/workflows/glow_ci_internal_tests.yml
-#    with:
-#      QUICKSTART_PATH: ${{inputs.QUICKSTART_PATH}}
-#      DEPLOYMENT_DIR: ${{inputs.DEPLOYMENT_DIR}}
-#      PROFILE: 'bootable-jar'
+  # Skip bootable jar until the plugin implements GLow support for bootable jar
+  bootable-jar:
+    name: Openshift ${{inputs.QUICKSTART_PATH}}
+    if: ${{ contains(inputs.PROFILES, 'bootable-jar') }}
+    uses: ./.github/workflows/glow_ci_internal_tests.yml
+    with:
+      QUICKSTART_PATH: ${{inputs.QUICKSTART_PATH}}
+      DEPLOYMENT_DIR: ${{inputs.DEPLOYMENT_DIR}}
+      PROFILE: 'bootable-jar'
diff --git a/.github/workflows/glow_ci_internal_tests.yml b/.github/workflows/glow_ci_internal_tests.yml
@@ -84,7 +84,10 @@ jobs:
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
             ${{ 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
+          # 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
+          # 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
         shell: bash

diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
@@ -123,7 +123,10 @@ jobs:
           echo "Building bootable jar..."
           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
+          # 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
+          # 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..."          
@@ -230,7 +233,10 @@ jobs:
           echo "Building bootable jar..."
           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
+          #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
+          # 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..."