Create generic matrix script

The script expects a test array an builds a json {"test":["test1",
"test2"]}, and it is used by kselftest and ltp to create the text matrix

Signed-off-by: Camila Alvarez <cam.alvarez.i@gmail.com>

Author: CamilaAlvarez

.github/scripts/ltp.sh

@@ -21,9 +21,6 @@ OUT_DIR="/tests/results_json"
 # dependencies
 source /build/.env/bin/activate
 
-# TODO ltp-controllers is too slow for now because of cgroup_fj_stress.sh
-# but I haven't found an easy to skip this one from tuxrun
-ltp_tests=( "ltp-commands"  "ltp-syscalls" "ltp-mm" "ltp-hugetlb" "ltp-crypto" "ltp-cve" "ltp-containers" "ltp-fs" "ltp-sched" )
 
 mkdir -p $OUT_DIR
 

.github/scripts/matrix/generate_json.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail 
+
+TESTS=($@)
+
+PARSED_TESTS=$( printf '%s\n' "${TESTS[@]}" | jq -R . | jq -cs .)
+JSON=$(jq -cn --argjson tests "$PARSED_TESTS" '{test: $tests}')
+echo "$JSON"

.github/scripts/generate_tests_array.sh renamed to .github/scripts/matrix/kselftest_matrix.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
 set -euo pipefail
-
 d=`dirname ${BASH_SOURCE[0]}`
-. $d/series/utils.sh
+. $d/../series/utils.sh
 selftests=$1
 output=$2
 name=${3:-"matrix"}
@@ -13,6 +12,5 @@ curl -L $selftests -o selftests.tar.gz &&\
 tar xvf selftests.tar.gz
 
 parse_tests_array .
-KTESTS=$( printf '%s\n' "${kselftest_subtests[@]}" | jq -R . | jq -cs .)
-JSON=$(jq -cn --argjson tests "$KTESTS" '{test: $tests}')
-echo "$name$separator$JSON" >> $output
+json=$($d/generate_json.sh "${kselftest_subtests[@]}")
+echo $name$separator$json >> $output

.github/scripts/matrix/ltp_matrix.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euo pipefail
+
+d=`dirname ${BASH_SOURCE[0]}`
+
+output=$1
+name=${2:-"matrix"}
+separator=${3:-"="}
+# TODO ltp-controllers is too slow for now because of cgroup_fj_stress.sh
+# but I haven't found an easy to skip this one from tuxrun
+ltp_tests=( "ltp-commands"  "ltp-syscalls" "ltp-mm" "ltp-hugetlb" "ltp-crypto" "ltp-cve" "ltp-containers" "ltp-fs" "ltp-sched" )
+json=$($d/generate_json.sh "${ltp_tests[@]}")
+echo $name$separator$json >> $output

.github/workflows/kselftest.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Create Matrix
         id: create-matrix
         run: |
-          ./.github/scripts/generate_tests_array.sh "${{ inputs.selftests-url }}" $GITHUB_OUTPUT
+          ./.github/scripts/matrix/kselftest_matrix.sh "${{ inputs.selftests-url }}" $GITHUB_OUTPUT
 
   run-tests:
     runs-on: ubuntu-latest

.github/workflows/ltp.yml

@@ -21,6 +21,16 @@ on:
         type: string
 
 jobs:
+  setup-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - name: Create LTP matrix
+        id: matrix
+        run: |
+          ./.github/scripts/matrix/ltp_matrix.sh $GITHUB_OUTPUT
+
   run-ltp:
     runs-on: ubuntu-latest
     needs: setup-matrix