From a3bda27960a56365b3b9422d19e19f77ba5a4b63 Mon Sep 17 00:00:00 2001
From: Eduardo Martins <emartins@redhat.com>
Date: Thu, 26 Oct 2023 22:10:10 +0100
Subject: [PATCH] [WFLY-18689] adds matrix.jdk customization, fixes add-users
 feature

---
 .github/workflows/quickstart_ci.yml           | 20 +++++++++++++++----
 .../quickstart_spring-resteasy_ci.yml         |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
index 16e171828b..97db9c237c 100644
--- a/.github/workflows/quickstart_ci.yml
+++ b/.github/workflows/quickstart_ci.yml
@@ -22,6 +22,11 @@ on:
         required: false
         default: true
         type: boolean
+      MATRIX_JDK:
+        description: 'the JDKs to be used on the test matrix, i.e. matrix.jdk'
+        required: false
+        default: '"11", "17"'
+        type: string
       MATRIX_OS:
         description: 'the OSes to be used on the test matrix, i.e. matrix.os'
         required: false
@@ -42,9 +47,12 @@ jobs:
   Matrix-Setup:
     runs-on: ubuntu-latest
     outputs:
-      os: ${{ steps.setup-os-matrix.outputs.os }}
+      os: ${{ steps.setup-matrix-os.outputs.os }}
+      jdk: ${{ steps.setup-matrix-jdk.outputs.jdk }}
     steps:
-      - id: setup-os-matrix
+      - id: setup-matrix-jdk
+        run: echo 'jdk=[${{ inputs.MATRIX_JDK }}]' >> $GITHUB_OUTPUT
+      - id: setup-matrix-os
         run: echo 'os=[${{ inputs.MATRIX_OS }}]' >> $GITHUB_OUTPUT
 
   Test-build-default-matrix:
@@ -54,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [11, 17]
+        jdk: ${{ fromJSON(needs.Matrix-Setup.outputs.jdk) }}
         os: ${{ fromJSON(needs.Matrix-Setup.outputs.os) }}
     steps:
       - uses: actions/checkout@v4
@@ -152,7 +160,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [11, 17]
+        jdk: ${{ fromJSON(needs.Matrix-Setup.outputs.jdk) }}
         os: ${{ fromJSON(needs.Matrix-Setup.outputs.os) }}
     steps:
       - uses: actions/checkout@v4
@@ -194,6 +202,10 @@ jobs:
           cd ${{ inputs.QUICKSTART_PATH }}
           echo "Building provisioned server..."
           mvn -U -B -fae clean package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          echo "Add quickstartUser..."
+          target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
+          echo "Add quickstartAdmin..."
+          target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
           echo "Starting provisioned server..."
           mvn -U -B -fae wildfly:start -DjbossHome=target/server -Dstartup-timeout=120
           echo "Testing provisioned server..."
diff --git a/.github/workflows/quickstart_spring-resteasy_ci.yml b/.github/workflows/quickstart_spring-resteasy_ci.yml
index 69d43fcdeb..c5cb8e7d71 100644
--- a/.github/workflows/quickstart_spring-resteasy_ci.yml
+++ b/.github/workflows/quickstart_spring-resteasy_ci.yml
@@ -12,3 +12,4 @@ jobs:
     with:
       QUICKSTART_PATH: spring-resteasy
       TEST_PROVISIONED_SERVER: true
+      MATRIX_JDK: '"17"'