Add env: ${{ matrix.env }} to tier2 and 3 jobs

Default PATH seems to not be evaluated even in defined in jsonnet file, manually set

Author: Ariouz

.github/workflows/ci-matrix-gen.yml

@@ -106,6 +106,7 @@ jobs:
       - name: Install system packages on macOS
         if: ${{ runner.os == 'macOS' && matrix.system_packages }}
         run: |
+          echo $PATH
           brew update
           for pkg in ${{ matrix.system_packages }}; do
               brew install "$pkg" || true
@@ -231,6 +232,7 @@ jobs:
     if: ${{ success() || inputs.jobs_to_run }}
     needs: [generate-tier2, tier1]
     runs-on: ${{ matrix.os }}
+    env: ${{ matrix.env }}
     strategy:
       fail-fast: false
       matrix:
@@ -241,6 +243,7 @@ jobs:
     if: ${{ success() || inputs.jobs_to_run }}
     needs: [generate-tier3, tier2]
     runs-on: ${{ matrix.os }}
+    env: ${{ matrix.env }}
     strategy:
       fail-fast: false
       matrix:

ci/python-gate.libsonnet

@@ -151,6 +151,7 @@
         darwin: {
             common: ENV_POSIX + {
                 LC_CTYPE: "en_US.UTF-8",
+                PATH: utils.path_combine(ENVIRONMENT.common.PATH, "$PYTHON3_HOME:$MUSL_TOOLCHAIN/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/homebrew/bin:/opt/homebrew/sbin"),
             },
             amd64: {},
             aarch64: {},
@@ -169,7 +170,7 @@
         LD_LIBRARY_PATH: "$LIBGMP/lib:$LLVM/lib:$LD_LIBRARY_PATH",
         FORK_COUNTS_DIRECTORY: "$BUILD_DIR/benchmarking-config/fork-counts",
         RODINIA_DATASET_ZIP: $.overlay_imports.RODINIA_DATASET_ZIP,
-        PATH: utils.path_combine(ENVIRONMENT.common.PATH, "$PYTHON3_HOME:$PATH:$MUSL_TOOLCHAIN/bin"),
+        PATH: utils.path_combine(ENVIRONMENT.common.PATH, "$PYTHON3_HOME:$MUSL_TOOLCHAIN/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"),
     },
 
     // This is the diff to 'ENVIRONMENT' and meant to be used on OL8 images.