[workflow] stop using tests-matrix and veristat-matrix

At this stage, we are already not using `test-matrix` anymore, so let's remove it
and move the logic of adding the tests within the first loop over the matrix.

For where to run veristat, as eluded to in a comment I am removing, we can control
that from within matrix.py directly.
Finally, we probably don't care on what/where veristat runs on. Let's default
to wherever we are currently running builds and tests.

Unless specified on the matrix, we will not run veristat.

Finally, here is what the output of matrix looks like
```
GITHUB_REPOSITORY_OWNER=kernel-patches GITHUB_REPOSITORY=vmtest GITHUB_OUTPUT=/dev/stdout python3 .github/scripts/matrix.py   | cut -d= -f2- | jq .
{
  "include": [
    {
      "kernel": "LATEST",
      "runs_on": [
        "ubuntu-20.04"
      ],
      "arch": "x86_64",
      "toolchain": "gcc",
      "llvm-version": "16",
      "run_veristat": true,
      "toolchain_full": "gcc",
      "tests": {
        "include": [
          {
            "test": "test_progs",
            "continue_on_error": false,
            "timeout_minutes": 360
          },
          {
            "test": "test_progs_parallel",
            "continue_on_error": true,
            "timeout_minutes": 30
          },
          {
            "test": "test_progs_no_alu32",
            "continue_on_error": false,
            "timeout_minutes": 360
          },
          {
            "test": "test_progs_no_alu32_parallel",
            "continue_on_error": true,
            "timeout_minutes": 30
          },
          {
            "test": "test_maps",
            "continue_on_error": false,
            "timeout_minutes": 360
          },
          {
            "test": "test_verifier",
            "continue_on_error": false,
            "timeout_minutes": 360
          }
        ]
      }
    },
    {
      "kernel": "LATEST",
      "runs_on": [
        "ubuntu-20.04"
      ],
      "arch": "x86_64",
      "toolchain": "llvm",
      "llvm-version": "16",
      "toolchain_full": "llvm-16",
      "run_veristat": false,
      "tests": {
        "include": [
          {
            "test": "test_progs",
            "continue_on_error": false,
            "timeout_minutes": 360
          },
          {
            "test": "test_progs_parallel",
            "continue_on_error": true,
            "timeout_minutes": 30
          },
          {
            "test": "test_progs_no_alu32",
            "continue_on_error": false,
            "timeout_minutes": 360
          },
          {
            "test": "test_progs_no_alu32_parallel",
            "continue_on_error": true,
            "timeout_minutes": 30
          },
          {
            "test": "test_maps",
            "continue_on_error": false,
            "timeout_minutes": 360
          },
          {
            "test": "test_verifier",
            "continue_on_error": false,
            "timeout_minutes": 360
          }
        ]
      }
    }
  ]
}
```

Signed-off-by: Manu Bretelle <chantr4@gmail.com>

Author: chantra

.github/scripts/matrix.py

@@ -63,6 +63,7 @@ def get_tests(config):
         "arch": Arch.X86_64.value,
         "toolchain": "gcc",
         "llvm-version": "16",
+        "run_veristat": True,
     },
     {
         "kernel": "LATEST",
@@ -105,6 +106,15 @@ def get_tests(config):
     else:
         matrix[idx]["toolchain_full"] = "llvm-" + matrix[idx]["llvm-version"]
 
+    # Set run_veristat to false by default.
+    matrix[idx]["run_veristat"] = matrix[idx].get("run_veristat", False)
+    # Feel in the tests
+    matrix[idx]["tests"] = {"include": [
+            generate_test_config(test)
+            for test in get_tests(matrix[idx])
+        ]
+    }
+
 # Only a few repository within "kernel-patches" use self-hosted runners.
 if (
     os.environ["GITHUB_REPOSITORY_OWNER"] != "kernel-patches"
@@ -124,29 +134,6 @@ def get_tests(config):
     for idx in range(len(matrix) - 1, -1, -1):
         matrix[idx]["runs_on"].extend(["self-hosted", matrix[idx]["arch"]])
 
-build_matrix = {"include": deepcopy(matrix)}
-# include test configs directly with the build config
-for config in build_matrix["include"]:
-    config["tests"] = {"include": [
-        generate_test_config(test)
-        for test in get_tests(config)
-    ]}
-
-set_output("build_matrix", dumps(build_matrix))
-
-test_matrix = {
-    "include": [
-        {**config, **generate_test_config(test)}
-        for config in matrix
-        for test in get_tests(config)
-    ]
-}
-set_output("test_matrix", dumps(test_matrix))
-
-veristat_runs_on = next(
-    x["runs_on"]
-    for x in matrix
-    if x["arch"] == os.environ["veristat_arch"]
-    and x["toolchain"] == os.environ["veristat_toolchain"]
-)
-set_output("veristat_runs_on", veristat_runs_on)
+build_matrix = {"include": matrix}
+
+set_output("build_matrix", dumps(build_matrix))

.github/workflows/kernel-build-test.yml

@@ -31,10 +31,10 @@ on:
         required: true
         type: string
         description: A serialized json array with the tests to be running, it must follow the json-matrix format, https://www.jitsejan.com/use-github-actions-with-json-file-as-matrix
-      veristat_runs_on:
+      run_veristat:
         required: true
-        type: string
-        description: Runners to run veristat on.
+        type: boolean
+        description: Whether or not to run veristat
     secrets:
       AWS_ROLE_ARN:
         required: true
@@ -70,7 +70,7 @@ jobs:
       timeout_minutes: ${{ matrix.timeout_minutes }}
 
   veristat:
-    if: ${{ inputs.arch == 'x86_64' &&  inputs.toolchain  == 'gcc' }}
+    if: ${{ inputs.run_veristat }}
     uses: ./.github/workflows/kernel-veristat.yml
     needs: [build]
     permissions:
@@ -80,6 +80,6 @@ jobs:
       arch: ${{ inputs.arch }}
       toolchain: ${{ inputs.toolchain }}
       aws_region: ${{ vars.AWS_REGION }}
-      runs_on: ${{ inputs.veristat_runs_on }}
+      runs_on: ${{ inputs.runs_on }}
     secrets:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}

.github/workflows/test.yml

@@ -7,13 +7,6 @@ on:
       - bpf_base
       - bpf-next_base
 
-# FIXME: We are using env variable here for set-matrix, and later in veristat job, hardcoded values
-# We should probably let the python script deal with it and generate a matrix that we pass onto
-# the reusable workflow.
-env:
-  veristat_arch: x86_64
-  veristat_toolchain: gcc
-
 concurrency:
   group: ci-test-${{ github.ref_name }}
   cancel-in-progress: true
@@ -28,8 +21,6 @@ jobs:
     runs-on: ${{ github.repository_owner == 'kernel-patches' && 'x86_64' || 'ubuntu-latest' }}
     outputs:
       build-matrix: ${{ steps.set-matrix-impl.outputs.build_matrix }}
-      test-matrix: ${{ steps.set-matrix-impl.outputs.test_matrix }}
-      veristat-runs-on: ${{ steps.set-matrix-impl.outputs.veristat_runs_on }}
     steps:
       - uses: actions/checkout@v3
       - id: set-matrix-impl
@@ -56,6 +47,6 @@ jobs:
       llvm-version: ${{ matrix.llvm-version }}
       kernel: ${{ matrix.kernel }}
       tests: ${{ toJSON(matrix.tests) }}
-      veristat_runs_on: ${{ needs.set-matrix.outputs.veristat-runs-on }}
+      run_veristat: ${{ matrix.run_veristat }}
     secrets:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}