updatd manual test-flows

Author: mirzakaracic

.github/actions/build-and-test/action.yaml

@@ -6,10 +6,6 @@ inputs:
     description: "Crypto type to use. This should either be bouncycastle or gnu"
     required: false
     default: gnu
-  use-server-rc:
-    required: false
-    default: "false"
-    description: "Test against server release candidate?"
   server-tag:
     required: false
     default: "latest"
@@ -48,7 +44,6 @@ runs:
       if: ${{ inputs.run-tests == 'true' }}
       uses: ./.github/actions/run-ee-server
       with:
-        use-server-rc: ${{ inputs.use-server-rc }}
         server-tag: ${{ inputs.server-tag }}
         server-type: ${{ inputs.server-type }}
         oidc-provider: ${{ inputs.oidc-provider }}

.github/workflows/test-branch-runner.yaml

@@ -9,16 +9,66 @@ on:
         description: Branch to run test against
 
 jobs:
+  make-matrix:
+    runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
+    outputs:
+      input-matrix: ${{ steps.set.outputs.input-matrix }}
+      java-version: ${{ steps.get-java-version.outputs.java-version }}
+    steps:
+      - uses: actions/checkout@v4       # brings versions.json into the workspace
+        with:
+          ref: ${{ github.ref }}
+
+      - id: set                         # create the matrix (compact JSON string)
+        shell: bash
+        env:
+            DEFAULT_JSON: ${{ vars.DEFAULT_SERVER_VERSIONS }}
+            TEST_SERVERS_FILE_PATH: ${{ vars.TEST_SERVERS_FILE_PATH }}
+        run: |
+          FILE=${TEST_SERVERS_FILE_PATH}
+
+          if [[ -s "$FILE" ]]; then
+            echo "Using $FILE from repository"
+            JSON=$(cat "$FILE")
+          else
+            echo "$FILE missing or empty – using DEFAULT_SERVER_VERSIONS"
+            JSON="$DEFAULT_JSON"
+          fi
+
+          MATRIX=$(echo "$JSON" | jq -c '
+            to_entries
+            | map({
+                server:  .key,
+                version: .value.version,
+                type: .value.type,
+              })
+          ')
+
+          echo input-matrix="$MATRIX" >> $GITHUB_OUTPUT
+
+      - name: Get java version
+        id: get-java-version
+        run: |
+          echo java-version="$(grep '<java.version>' pom.xml | sed -e 's/<[^>]*>//g' | awk '{$1=$1};1' | sed 's/^1\.8$/8/')"  >> $GITHUB_OUTPUT
+
+      - name: debug - print input variables
+        run: |
+          echo ${{ steps.get-java-version.outputs.java-version }}
+          echo ${{ steps.set.outputs.input-matrix }}
+
   build-and-test:
     uses: ./.github/workflows/test-branch.yaml
+    needs: make-matrix
     strategy:
-      matrix:
+      matrix: 
+        include: ${{ fromJson(needs.make-matrix.outputs.input-matrix) }}
         crypto-type: [bouncycastle, gnu]
-        use-server-rc: [true, false]
-      fail-fast: false
+    name: build-${{ matrix.server }}-${{ matrix.version }}
     with:
-      source-branch: ${{ inputs.source-branch }}
+      java-version: ${{ needs.make-matrix.outputs.java-version }}
       crypto-type: ${{ matrix.crypto-type }}
-      use-server-rc: ${{ matrix.use-server-rc }}
-      server-tag: latest
-    secrets: inherit
+      source-branch: ${{ inputs.source-branch }}
+      run-tests: true 
+      server-tag: ${{ matrix.version }}
+      server-type: ${{ matrix.type }}
+    secrets: inherit

.github/workflows/test-branch.yaml

@@ -12,12 +12,15 @@ on:
       crypto-type:
         type: string
         required: true
-      use-server-rc:
-        type: boolean
+      java-version:
+        type: string
         required: true
       server-tag:
         type: string
         required: true
+      server-type:
+        type: string
+        required: true
     secrets:
       JFROG_OIDC_PROVIDER:
         required: true
@@ -34,25 +37,20 @@ jobs:
           fetch-depth: 0
           ref: ${{ inputs.source-branch }}
 
-      - name: Get java version
-        id: get-java-version
-        run: |
-          echo java-version="$(grep '<java.version>' pom.xml | sed -e 's/<[^>]*>//g' | awk '{$1=$1};1' | sed 's/^1\.8$/8/')"  >> $GITHUB_OUTPUT
-
       # Java plugin will setup gpg but we are not using maven to deploy do JFrog.
       # - jf mvn clean install on publish does not publish POM we would like to publish
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: "semeru"
-          java-version: ${{ steps.get-java-version.outputs.java-version }}
+          java-version: ${{ inputs.java-version }}
 
       # Running build followed by tests
       - name: Build and test
         uses: ./.github/actions/build-and-test
         with:
           crypto-type: ${{ inputs.crypto-type }}
           server-tag: ${{ inputs.server-tag }}
-          use-server-rc: ${{ inputs.use-server-rc }}
+          server-type: ${{ inputs.server-type }}
           oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
           oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}