From c3a8e3d90feb5761da75774b0378253d8a8ef4b0 Mon Sep 17 00:00:00 2001
From: Kabir Khan <kkhan@redhat.com>
Date: Fri, 12 Jan 2024 15:59:36 +0000
Subject: [PATCH] Ears need to use install to populate the mvn repo, or mvn
 wildfly:start fails on resolving dependencies in the ear module

---
 .github/workflows/quickstart_ci.yml             | 17 ++++++++++++-----
 .../quickstart_ejb-throws-exception_ci.yml      |  3 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
index 0235a2251e..e310c007d8 100644
--- a/.github/workflows/quickstart_ci.yml
+++ b/.github/workflows/quickstart_ci.yml
@@ -47,6 +47,12 @@ on:
         required: false
         default: ''
         type: string
+      MVN_COMMAND:
+        description: 'Maven command to use when building the project. Default is ''package'', ears needs ''install'''
+        required: false
+        default: 'package'
+        type: string
+
 
 # Only run the latest job
 concurrency:
@@ -101,7 +107,8 @@ jobs:
         run: |
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
-          mvn -fae clean install -Drelease
+          # Make sure it builds
+          mvn -fae clean package -Drelease
         shell: bash
       - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile
         if: ${{ inputs.TEST_PROVISIONED_SERVER }}
@@ -109,7 +116,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
-          mvn -fae clean package -Pprovisioned-server
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pprovisioned-server
           if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then 
             echo "Add quickstartUser..."
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
@@ -129,7 +136,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building bootable jar..."
-          mvn -fae clean package -Pbootable-jar
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pbootable-jar
           echo "Starting bootable jar..."
           mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120  ${{ inputs.EXTRA_RUN_ARGS }}
           echo "Testing bootable jar..."
@@ -216,7 +223,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
-          mvn -fae clean package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
           if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then
             echo "Add quickstartUser..."
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
@@ -236,7 +243,7 @@ jobs:
           cd quickstarts
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building bootable jar..."
-          mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
+          mvn -fae clean ${{ env.MVN_COMMAND }} -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }}
           echo "Starting bootable jar..."
           mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }}
           echo "Testing bootable jar..."
diff --git a/.github/workflows/quickstart_ejb-throws-exception_ci.yml b/.github/workflows/quickstart_ejb-throws-exception_ci.yml
index b7ba9a758c..90038d175a 100644
--- a/.github/workflows/quickstart_ejb-throws-exception_ci.yml
+++ b/.github/workflows/quickstart_ejb-throws-exception_ci.yml
@@ -14,4 +14,5 @@ jobs:
       QUICKSTART_PATH: ejb-throws-exception
       DEPLOYMENT_DIR: ear
       TEST_PROVISIONED_SERVER: true
-      TEST_OPENSHIFT: false
\ No newline at end of file
+      TEST_OPENSHIFT: false
+      MVN_COMMAND: install
\ No newline at end of file