move run to matrix

intel · Feb 23, 2024 · 441647a · 441647a
1 parent c97e9dc
commit 441647a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml
@@ -288,7 +288,7 @@ jobs:
         $CMAKE_EXTRA_ARGS
         ninja -C build-cts
 
-    - name: [CTS] List devices
+    - name: SYCL CTS List devices
       if: inputs.tests_selector == 'cts'
       run: |
         ./build-cts/bin/test_all --list-devices

diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml
@@ -71,13 +71,21 @@ jobs:
             image: ghcr.io/intel/llvm/ubuntu2204_build:latest
             image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
             target_devices: ext_oneapi_cuda:gpu
+
+          - name: SYCL-CTS
+            runner: '["cts-cpu"]'
+            image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+            target_devices: opencl:cpu
+            tests_selector: cts
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
       image: ${{ matrix.image }}
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
+      tests_selector: ${{ matrix.tests_selector }}
       reset_gpu: ${{ matrix.reset_gpu }}
       ref: ${{ github.sha }}
       merge_ref: ''
@@ -107,22 +115,6 @@ jobs:
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
 
-  sycl-cts:
-    needs: [ubuntu2204_build]
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    with:
-      name: SYCL-CTS
-      runner: '["cts-cpu"]'
-      image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
-      image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-      target_devices: opencl:cpu
-      tests_selector: cts
-      install_drivers: false
-      ref: ${{ github.sha }}
-      sycl_toolchain_artifact: sycl_linux_default
-      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-
   nightly_build_upload:
     name: Nightly Build Upload
     if: ${{ github.ref_name == 'sycl' }}