From d6c8d1019f896ba68ac959bd38e836679a1ac215 Mon Sep 17 00:00:00 2001
From: Andrei Elovikov <andrei.elovikov@intel.com>
Date: Wed, 5 Nov 2025 09:53:46 -0800
Subject: [PATCH 1/2] [CI] Unify `*_testing_mode` input

---
 .github/workflows/sycl-linux-precommit.yml    |  2 +-
 .github/workflows/sycl-linux-run-tests.yml    | 18 ++++----------
 .github/workflows/sycl-nightly.yml            |  8 +++----
 .github/workflows/sycl-post-commit.yml        |  4 ++--
 .github/workflows/sycl-weekly.yml             |  4 ++--
 .github/workflows/sycl-windows-precommit.yml  |  2 +-
 .github/workflows/sycl-windows-run-tests.yml  | 21 +++++++---------
 devops/actions/run-tests/cts/action.yml       | 24 +++++++++----------
 .../actions/run-tests/windows/cts/action.yml  | 24 +++++++++----------
 .../actions/run-tests/windows/e2e/action.yml  |  2 +-
 10 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml
index 5c0bad6ba7dae..eaf39fb3333e1 100644
--- a/.github/workflows/sycl-linux-precommit.yml
+++ b/.github/workflows/sycl-linux-precommit.yml
@@ -215,7 +215,7 @@ jobs:
       toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }}
       e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact || 'e2e_bin' }}
-      e2e_testing_mode: 'run-only'
+      testing_mode: 'run-only'
 
       # Do not install drivers on AMD and CUDA runners.
       install_igc_driver: >-
diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml
index 6264a3ee594a7..20b4f54b132f4 100644
--- a/.github/workflows/sycl-linux-run-tests.yml
+++ b/.github/workflows/sycl-linux-run-tests.yml
@@ -68,9 +68,9 @@ on:
         type: string
         default: ''
         required: False
-      e2e_testing_mode:
+      testing_mode:
         description: |
-          Testing mode to run E2E tests in, can be either `full`, `build-only`
+          Testing mode to run E2E/CTS tests in, can be either `full`, `build-only`
           or `run-only`.
         type: string
         default: 'full'
@@ -95,14 +95,6 @@ on:
         default: 'false'
         required: False
 
-      cts_testing_mode:
-        description: |
-          Testing mode to run SYCL-CTS in, can be either `full`, `build-only`
-          or `run-only`. In `build-only` mode an artifact of the CTS binaries
-          will be uploaded.
-        type: string
-        default: 'full'
-
       sycl_cts_artifact:
         type: string
         default: ''
@@ -211,7 +203,7 @@ on:
           Extra options to be added to LIT_OPTS.
         default: ''
 
-      e2e_testing_mode:
+      testing_mode:
         type: choice
         options:
           - "full"
@@ -346,7 +338,7 @@ jobs:
       with:
         ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
         binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
-        testing_mode: ${{ inputs.e2e_testing_mode }}
+        testing_mode: ${{ inputs.testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         target_devices: ${{ inputs.target_devices }}
         extra_lit_opts: ${{ inputs.extra_lit_opts }}
@@ -361,7 +353,7 @@ jobs:
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
-        cts_testing_mode: ${{ inputs.cts_testing_mode }}
+        testing_mode: ${{ inputs.testing_mode }}
         sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
         target_devices: ${{ inputs.target_devices }}
         retention-days: ${{ inputs.retention-days }}
diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml
index cab4d841ddeab..308a31dfe550b 100644
--- a/.github/workflows/sycl-nightly.yml
+++ b/.github/workflows/sycl-nightly.yml
@@ -271,7 +271,7 @@ jobs:
     with:
       name: Build SYCL-CTS for Linux
       runner: '["Linux", "build"]'
-      cts_testing_mode: 'build-only'
+      testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
       repo_ref: ${{ github.sha }}
@@ -303,7 +303,7 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
+      testing_mode: 'run-only'
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
@@ -320,7 +320,7 @@ jobs:
     with:
       name: Build SYCL-CTS for Windows
       runner: '["Windows", "build"]'
-      cts_testing_mode: 'build-only'
+      testing_mode: 'build-only'
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
@@ -340,7 +340,7 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
+      testing_mode: 'run-only'
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
       repo_ref: ${{ github.sha }}
diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml
index 438259efb1c86..87f9b969500c9 100644
--- a/.github/workflows/sycl-post-commit.yml
+++ b/.github/workflows/sycl-post-commit.yml
@@ -82,7 +82,7 @@ jobs:
             target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             extra_lit_opts: --param spirv-backend=True
             e2e_binaries_artifact: e2e_bin_spirv_backend
-            e2e_testing_mode: 'run-only'
+            testing_mode: 'run-only'
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}
@@ -100,7 +100,7 @@ jobs:
       toolchain_decompress_command: ${{ needs.build-lin.outputs.toolchain_decompress_command }}
 
       e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact }}
-      e2e_testing_mode: ${{ matrix.e2e_testing_mode || 'full' }}
+      testing_mode: ${{ matrix.testing_mode || 'full' }}
 
       # Do not install drivers on AMD and CUDA runners.
       install_igc_driver: >-
diff --git a/.github/workflows/sycl-weekly.yml b/.github/workflows/sycl-weekly.yml
index efd42991a8461..274ac73feffa5 100644
--- a/.github/workflows/sycl-weekly.yml
+++ b/.github/workflows/sycl-weekly.yml
@@ -30,7 +30,7 @@ jobs:
     with:
       name: Build SYCL-CTS
       runner: '["Linux", "build"]'
-      cts_testing_mode: 'build-only'
+      testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
       repo_ref: ${{ github.sha }}
@@ -63,7 +63,7 @@ jobs:
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
-      cts_testing_mode: 'run-only'
+      testing_mode: 'run-only'
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
diff --git a/.github/workflows/sycl-windows-precommit.yml b/.github/workflows/sycl-windows-precommit.yml
index 58254e8495815..ee02e02db3bb9 100644
--- a/.github/workflows/sycl-windows-precommit.yml
+++ b/.github/workflows/sycl-windows-precommit.yml
@@ -79,5 +79,5 @@ jobs:
       runner: ${{ matrix.runner }}
       target_devices: "level_zero:gpu"
       toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
-      e2e_testing_mode: run-only
+      testing_mode: run-only
       e2e_binaries_artifact: sycl_windows_e2ebin
diff --git a/.github/workflows/sycl-windows-run-tests.yml b/.github/workflows/sycl-windows-run-tests.yml
index 21bdf77267436..55f46454aacda 100644
--- a/.github/workflows/sycl-windows-run-tests.yml
+++ b/.github/workflows/sycl-windows-run-tests.yml
@@ -58,23 +58,20 @@ on:
         required: false
         default: "cl"
 
-      e2e_testing_mode:
+      testing_mode:
+        description: |
+          Testing mode to run E2E/SYCL-CTS in, can be either `full`, `build-only`
+          or `run-only`. In `build-only` mode an artifact of the tests binaries
+          will be uploaded.
         type: string
-        default: "full"
+        default: 'full'
+
 
       e2e_binaries_artifact:
         type: string
         default: ''
         required: False
 
-      cts_testing_mode:
-        description: |
-          Testing mode to run SYCL-CTS in, can be either `full`, `build-only`
-          or `run-only`. In `build-only` mode an artifact of the CTS binaries
-          will be uploaded.
-        type: string
-        default: 'full'
-
       sycl_cts_artifact:
         type: string
         default: ''
@@ -154,7 +151,7 @@ jobs:
       with:
         ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
         binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
-        testing_mode: ${{ inputs.e2e_testing_mode }}
+        testing_mode: ${{ inputs.testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         target_devices: ${{ inputs.target_devices }}
         extra_lit_opts: ${{ inputs.extra_lit_opts }}
@@ -167,7 +164,7 @@ jobs:
       with:
         ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
-        cts_testing_mode: ${{ inputs.cts_testing_mode }}
+        testing_mode: ${{ inputs.testing_mode }}
         sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
         target_devices: ${{ inputs.target_devices }}
         retention-days: ${{ inputs.artifact_retention_days }}
diff --git a/devops/actions/run-tests/cts/action.yml b/devops/actions/run-tests/cts/action.yml
index d5c865d208b34..60bba022b54ce 100644
--- a/devops/actions/run-tests/cts/action.yml
+++ b/devops/actions/run-tests/cts/action.yml
@@ -6,7 +6,7 @@ inputs:
     required: true
   extra_cmake_args:
     required: false
-  cts_testing_mode:
+  testing_mode:
     required: true
   sycl_cts_artifact:
     require: false
@@ -19,7 +19,7 @@ runs:
   using: "composite"
   steps:
   - name: Checkout SYCL CTS tests
-    if: inputs.cts_testing_mode != 'run-only'
+    if: inputs.testing_mode != 'run-only'
     uses: ./devops/actions/cached_checkout
     with:
       path: khronos_sycl_cts
@@ -27,12 +27,12 @@ runs:
       ref: ${{ inputs.ref }}
       cache_path: "/__w/repo_cache/"
   - name: SYCL CTS GIT submodules init
-    if: inputs.cts_testing_mode != 'run-only'
+    if: inputs.testing_mode != 'run-only'
     shell: bash
     run: |
       git -C khronos_sycl_cts submodule update --init
   - name: Build SYCL CTS tests
-    if: inputs.cts_testing_mode != 'run-only'
+    if: inputs.testing_mode != 'run-only'
     shell: bash
     env:
       CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }}
@@ -40,7 +40,7 @@ runs:
       cts_exclude_filter=""
       # If CTS_TESTS_TO_BUILD is null - use filter
       if [ -z "$CTS_TESTS_TO_BUILD" ]; then
-        if [ "${{ contains(inputs.cts_testing_mode, 'build-only')  }}" = "true" ]; then
+        if [ "${{ contains(inputs.testing_mode, 'build-only')  }}" = "true" ]; then
           cts_exclude_filter=$PWD/sycl/cts_exclude_filter/compfails
         elif [ "${{ contains(inputs.target_devices, 'opencl:cpu')  }}" = "true" ]; then
           cts_exclude_filter=$PWD/sycl/cts_exclude_filter/LINUX_OCL_CPU
@@ -68,12 +68,12 @@ runs:
       ninja -C build-cts -k0 $( [ -n "$CTS_TESTS_TO_BUILD" ] && echo "$CTS_TESTS_TO_BUILD" || echo "test_conformance")
 
   - name: Pack SYCL-CTS binaries
-    if: always() && !cancelled() && inputs.cts_testing_mode == 'build-only'
+    if: always() && !cancelled() && inputs.testing_mode == 'build-only'
     shell: bash
     run: tar -I 'zstd -9' -cf sycl_cts_bin.tar.zst -C ./build-cts/bin .
 
   - name: Upload SYCL-CTS binaries
-    if: always() && !cancelled() && inputs.cts_testing_mode == 'build-only'
+    if: always() && !cancelled() && inputs.testing_mode == 'build-only'
     uses: actions/upload-artifact@v4
     with:
       name: ${{ inputs.sycl_cts_artifact }}
@@ -81,13 +81,13 @@ runs:
       retention-days: ${{ inputs.retention-days }}
 
   - name: Download SYCL-CTS binaries
-    if: inputs.cts_testing_mode == 'run-only'
+    if: inputs.testing_mode == 'run-only'
     uses: actions/download-artifact@v4
     with:
       name: ${{ inputs.sycl_cts_artifact }}
 
   - name: Extract SYCL-CTS binaries
-    if: inputs.cts_testing_mode == 'run-only'
+    if: inputs.testing_mode == 'run-only'
     shell: bash
     run: |
       mkdir -p build-cts/bin
@@ -95,7 +95,7 @@ runs:
 
   - name: SYCL CTS List devices
     # Proceed with execution even if the 'build' step did not succeed.
-    if: (always() && !cancelled()) && inputs.cts_testing_mode != 'build-only'
+    if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
     shell: bash
     env:
       ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
@@ -109,7 +109,7 @@ runs:
   # these files may differ from each other, so when there is a pre-built set of
   # tests, we need to filter it according to the filter-file.
   - name: Filter SYCL CTS test categories
-    if: inputs.cts_testing_mode == 'run-only'
+    if: inputs.testing_mode == 'run-only'
     shell: bash
     run: |
       cts_exclude_filter=""
@@ -129,7 +129,7 @@ runs:
 
   - name: Run SYCL CTS tests
     # Proceed with execution even if the previous two steps did not succeed.
-    if: (always() && !cancelled()) && inputs.cts_testing_mode != 'build-only'
+    if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
     env:
       ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
     # By-default GitHub actions execute the "run" shell script with -e option,
diff --git a/devops/actions/run-tests/windows/cts/action.yml b/devops/actions/run-tests/windows/cts/action.yml
index a80674d418580..cbecf8aed832f 100644
--- a/devops/actions/run-tests/windows/cts/action.yml
+++ b/devops/actions/run-tests/windows/cts/action.yml
@@ -6,7 +6,7 @@ inputs:
     required: true
   extra_cmake_args:
     required: false
-  cts_testing_mode:
+  testing_mode:
     required: true
   sycl_cts_artifact:
     require: false
@@ -19,7 +19,7 @@ runs:
   using: "composite"
   steps:
   - name: Checkout SYCL CTS tests
-    if: inputs.cts_testing_mode != 'run-only'
+    if: inputs.testing_mode != 'run-only'
     uses: ./devops/actions/cached_checkout
     with:
       path: khronos_sycl_cts
@@ -27,12 +27,12 @@ runs:
       ref: ${{ inputs.ref }}
       cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
   - name: SYCL CTS GIT submodules init
-    if: inputs.cts_testing_mode != 'run-only'
+    if: inputs.testing_mode != 'run-only'
     shell: bash
     run: |
       git -C khronos_sycl_cts submodule update --init
   - name: Build SYCL CTS tests
-    if: inputs.cts_testing_mode != 'run-only'
+    if: inputs.testing_mode != 'run-only'
     shell: bash
     env:
       CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }}
@@ -40,7 +40,7 @@ runs:
       cts_exclude_filter=""
       # If CTS_TESTS_TO_BUILD is null - use filter
       if [ -z "$CTS_TESTS_TO_BUILD" ]; then
-        if [ "${{ contains(inputs.cts_testing_mode, 'build-only')  }}" = "true" ]; then
+        if [ "${{ contains(inputs.testing_mode, 'build-only')  }}" = "true" ]; then
           cts_exclude_filter=$PWD/sycl/cts_exclude_filter/compfails
         elif [ "${{ contains(inputs.target_devices, 'opencl:cpu')  }}" = "true" ]; then
           cts_exclude_filter=$PWD/sycl/cts_exclude_filter/WIN_OCL_CPU
@@ -70,12 +70,12 @@ runs:
       ninja -C build-cts -k0 $( [ -n "$CTS_TESTS_TO_BUILD" ] && echo "$CTS_TESTS_TO_BUILD" || echo "test_conformance")
 
   - name: Pack SYCL-CTS binaries
-    if: always() && !cancelled() && inputs.cts_testing_mode == 'build-only'
+    if: always() && !cancelled() && inputs.testing_mode == 'build-only'
     shell: bash
     run: tar -I 'zstd -9' -cf sycl_cts_bin.tar.zst -C ./build-cts/bin .
 
   - name: Upload SYCL-CTS binaries
-    if: always() && !cancelled() && inputs.cts_testing_mode == 'build-only'
+    if: always() && !cancelled() && inputs.testing_mode == 'build-only'
     uses: actions/upload-artifact@v4
     with:
       name: ${{ inputs.sycl_cts_artifact }}
@@ -83,13 +83,13 @@ runs:
       retention-days: ${{ inputs.retention-days }}
 
   - name: Download SYCL-CTS binaries
-    if: inputs.cts_testing_mode == 'run-only'
+    if: inputs.testing_mode == 'run-only'
     uses: actions/download-artifact@v4
     with:
       name: ${{ inputs.sycl_cts_artifact }}
 
   - name: Extract SYCL-CTS binaries
-    if: inputs.cts_testing_mode == 'run-only'
+    if: inputs.testing_mode == 'run-only'
     shell: bash
     run: |
       mkdir -p build-cts/bin
@@ -97,7 +97,7 @@ runs:
 
   - name: SYCL CTS List devices
     # Proceed with execution even if the 'build' step did not succeed.
-    if: (always() && !cancelled()) && inputs.cts_testing_mode != 'build-only'
+    if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
     shell: bash
     env:
       ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
@@ -111,7 +111,7 @@ runs:
   # these files may differ from each other, so when there is a pre-built set of
   # tests, we need to filter it according to the filter-file.
   - name: Filter SYCL CTS test categories
-    if: inputs.cts_testing_mode == 'run-only'
+    if: inputs.testing_mode == 'run-only'
     shell: bash
     run: |
       cts_exclude_filter=""
@@ -131,7 +131,7 @@ runs:
 
   - name: Run SYCL CTS tests
     # Proceed with execution even if the previous two steps did not succeed.
-    if: (always() && !cancelled()) && inputs.cts_testing_mode != 'build-only'
+    if: (always() && !cancelled()) && inputs.testing_mode != 'build-only'
     env:
       ONEAPI_DEVICE_SELECTOR: ${{ inputs.target_devices }}
     # By-default GitHub actions execute the "run" shell script with -e option,
diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml
index d8c52c05edb8f..3564361601d91 100644
--- a/devops/actions/run-tests/windows/e2e/action.yml
+++ b/devops/actions/run-tests/windows/e2e/action.yml
@@ -76,7 +76,7 @@ runs:
     continue-on-error: true
     shell: bash
     env:
-      LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time ${{ inputs.e2e_testing_mode == 'run-only' && 1200 || 3600 }} --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
+      LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time ${{ inputs.testing_mode == 'run-only' && 1200 || 3600 }} --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
     run: |
       cmake --build build-e2e --target check-sycl-e2e > e2e.log 2>&1
   # Two steps below are duplicated between Lin/Win actions, updates must change both

From 4ac0673c3a23ad58167f04260f0f24da403d3183 Mon Sep 17 00:00:00 2001
From: Andrei Elovikov <andrei.elovikov@intel.com>
Date: Wed, 5 Nov 2025 10:16:15 -0800
Subject: [PATCH 2/2] [CI] Unify `*_artifact` in `sycl-*-run-tests.yml`

---
 .github/workflows/sycl-linux-precommit.yml      |  8 ++++----
 .github/workflows/sycl-linux-run-tests.yml      | 13 ++++---------
 .github/workflows/sycl-nightly.yml              |  8 ++++----
 .github/workflows/sycl-post-commit.yml          |  4 ++--
 .github/workflows/sycl-weekly.yml               |  4 ++--
 .github/workflows/sycl-windows-precommit.yml    |  2 +-
 .github/workflows/sycl-windows-run-tests.yml    | 10 +++-------
 devops/actions/run-tests/cts/action.yml         |  6 +++---
 devops/actions/run-tests/windows/cts/action.yml |  6 +++---
 9 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml
index eaf39fb3333e1..c94a3469858a8 100644
--- a/.github/workflows/sycl-linux-precommit.yml
+++ b/.github/workflows/sycl-linux-precommit.yml
@@ -188,19 +188,19 @@ jobs:
             runner: '["Linux", "gen12"]'
             target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             extra_lit_opts: --param test-preview-mode=True
-            e2e_binaries_artifact: e2e_bin_preview
+            binaries_artifact: e2e_bin_preview
           - name: ABI compatibility / sycl-rel-6_2
             runner: '["Linux", "pvc"]'
             image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_2
             target_devices: level_zero:gpu
             extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_2 }}"'
-            e2e_binaries_artifact: 'in-container'
+            binaries_artifact: 'in-container'
           - name: ABI compatibility / sycl-rel-6_3
             runner: '["Linux", "pvc"]'
             image: ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_3
             target_devices: level_zero:gpu
             extra_lit_opts: '--param test-preview-mode=False --filter-out "${{ needs.compat_read_exclude.outputs.FILTER_6_3 }}"'
-            e2e_binaries_artifact: 'in-container'
+            binaries_artifact: 'in-container'
 
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
@@ -214,7 +214,7 @@ jobs:
       toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }}
-      e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact || 'e2e_bin' }}
+      binaries_artifact: ${{ matrix.binaries_artifact || 'e2e_bin' }}
       testing_mode: 'run-only'
 
       # Do not install drivers on AMD and CUDA runners.
diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml
index 20b4f54b132f4..e113ab46b7b42 100644
--- a/.github/workflows/sycl-linux-run-tests.yml
+++ b/.github/workflows/sycl-linux-run-tests.yml
@@ -58,7 +58,7 @@ on:
         default: ''
         required: False
 
-      e2e_binaries_artifact:
+      binaries_artifact:
         description: |
           When set in modes other than `run-only` results in artifact upload.
           For `run-only` mode, if specified, means downloading pre-built
@@ -95,11 +95,6 @@ on:
         default: 'false'
         required: False
 
-      sycl_cts_artifact:
-        type: string
-        default: ''
-        required: False
-
       benchmark_upload_results:
         description: |
           Set to true to upload results to git repository storing benchmarking
@@ -243,7 +238,7 @@ jobs:
     - name: Reset Intel GPU
       uses: ./devops/actions/reset_gpu
     - name: Install drivers
-      if: inputs.e2e_binaries_artifact != 'in-container' && (inputs.install_igc_driver == 'true' || inputs.install_dev_igc_driver == 'true')
+      if: inputs.binaries_artifact != 'in-container' && (inputs.install_igc_driver == 'true' || inputs.install_dev_igc_driver == 'true')
       env:
         GITHUB_TOKEN: ${{ github.token }}
       run: |
@@ -337,7 +332,7 @@ jobs:
       timeout-minutes: 60
       with:
         ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
-        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
         testing_mode: ${{ inputs.testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         target_devices: ${{ inputs.target_devices }}
@@ -354,7 +349,7 @@ jobs:
         ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         testing_mode: ${{ inputs.testing_mode }}
-        sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
         target_devices: ${{ inputs.target_devices }}
         retention-days: ${{ inputs.retention-days }}
 
diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml
index 308a31dfe550b..2d1ef2fcff86e 100644
--- a/.github/workflows/sycl-nightly.yml
+++ b/.github/workflows/sycl-nightly.yml
@@ -278,7 +278,7 @@ jobs:
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin_linux
+      binaries_artifact: sycl_cts_bin_linux
 
   run-sycl-cts-linux:
     needs: [ubuntu2204_build, build-sycl-cts-linux]
@@ -311,7 +311,7 @@ jobs:
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin_linux
+      binaries_artifact: sycl_cts_bin_linux
 
   build-sycl-cts-win:
     needs: build-win
@@ -324,7 +324,7 @@ jobs:
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
-      sycl_cts_artifact: sycl_cts_bin_win
+      binaries_artifact: sycl_cts_bin_win
 
   run-sycl-cts-win:
     needs: [build-win, build-sycl-cts-win]
@@ -345,7 +345,7 @@ jobs:
       tests_selector: cts
       repo_ref: ${{ github.sha }}
       toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
-      sycl_cts_artifact: sycl_cts_bin_win
+      binaries_artifact: sycl_cts_bin_win
 
   # Verification example:
   # cosign-windows-amd64.exe verify-blob sycl_linux.tar.gz \
diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml
index 87f9b969500c9..21da971ce382d 100644
--- a/.github/workflows/sycl-post-commit.yml
+++ b/.github/workflows/sycl-post-commit.yml
@@ -81,7 +81,7 @@ jobs:
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             extra_lit_opts: --param spirv-backend=True
-            e2e_binaries_artifact: e2e_bin_spirv_backend
+            binaries_artifact: e2e_bin_spirv_backend
             testing_mode: 'run-only'
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
@@ -99,7 +99,7 @@ jobs:
       toolchain_artifact_filename: ${{ needs.build-lin.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build-lin.outputs.toolchain_decompress_command }}
 
-      e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact }}
+      binaries_artifact: ${{ matrix.binaries_artifact }}
       testing_mode: ${{ matrix.testing_mode || 'full' }}
 
       # Do not install drivers on AMD and CUDA runners.
diff --git a/.github/workflows/sycl-weekly.yml b/.github/workflows/sycl-weekly.yml
index 274ac73feffa5..7c44b67eacde2 100644
--- a/.github/workflows/sycl-weekly.yml
+++ b/.github/workflows/sycl-weekly.yml
@@ -38,7 +38,7 @@ jobs:
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
       extra_cmake_args: -DDPCPP_FLAGS=-fsycl-use-spirv-backend-for-spirv-gen
-      sycl_cts_artifact: sycl_cts_bin
+      binaries_artifact: sycl_cts_bin
 
   run-sycl-cts:
     needs: [ubuntu2204_build, build-sycl-cts]
@@ -71,4 +71,4 @@ jobs:
       toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.toolchain_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin
+      binaries_artifact: sycl_cts_bin
diff --git a/.github/workflows/sycl-windows-precommit.yml b/.github/workflows/sycl-windows-precommit.yml
index ee02e02db3bb9..6a1f06f6ec919 100644
--- a/.github/workflows/sycl-windows-precommit.yml
+++ b/.github/workflows/sycl-windows-precommit.yml
@@ -80,4 +80,4 @@ jobs:
       target_devices: "level_zero:gpu"
       toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
       testing_mode: run-only
-      e2e_binaries_artifact: sycl_windows_e2ebin
+      binaries_artifact: sycl_windows_e2ebin
diff --git a/.github/workflows/sycl-windows-run-tests.yml b/.github/workflows/sycl-windows-run-tests.yml
index 55f46454aacda..33fbc7f00bf36 100644
--- a/.github/workflows/sycl-windows-run-tests.yml
+++ b/.github/workflows/sycl-windows-run-tests.yml
@@ -67,15 +67,11 @@ on:
         default: 'full'
 
 
-      e2e_binaries_artifact:
+      binaries_artifact:
         type: string
         default: ''
         required: False
 
-      sycl_cts_artifact:
-        type: string
-        default: ''
-        required: False
       artifact_retention_days:
         description: 'E2E/SYCL-CTS binaries artifact retention period.'
         type: string
@@ -150,7 +146,7 @@ jobs:
       timeout-minutes: 60
       with:
         ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
-        binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
         testing_mode: ${{ inputs.testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         target_devices: ${{ inputs.target_devices }}
@@ -165,7 +161,7 @@ jobs:
         ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         testing_mode: ${{ inputs.testing_mode }}
-        sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}
+        binaries_artifact: ${{ inputs.binaries_artifact }}
         target_devices: ${{ inputs.target_devices }}
         retention-days: ${{ inputs.artifact_retention_days }}
 
diff --git a/devops/actions/run-tests/cts/action.yml b/devops/actions/run-tests/cts/action.yml
index 60bba022b54ce..48ab02d3b67bc 100644
--- a/devops/actions/run-tests/cts/action.yml
+++ b/devops/actions/run-tests/cts/action.yml
@@ -8,7 +8,7 @@ inputs:
     required: false
   testing_mode:
     required: true
-  sycl_cts_artifact:
+  binaries_artifact:
     require: false
   target_devices:
     required: true
@@ -76,7 +76,7 @@ runs:
     if: always() && !cancelled() && inputs.testing_mode == 'build-only'
     uses: actions/upload-artifact@v4
     with:
-      name: ${{ inputs.sycl_cts_artifact }}
+      name: ${{ inputs.binaries_artifact }}
       path: sycl_cts_bin.tar.zst
       retention-days: ${{ inputs.retention-days }}
 
@@ -84,7 +84,7 @@ runs:
     if: inputs.testing_mode == 'run-only'
     uses: actions/download-artifact@v4
     with:
-      name: ${{ inputs.sycl_cts_artifact }}
+      name: ${{ inputs.binaries_artifact }}
 
   - name: Extract SYCL-CTS binaries
     if: inputs.testing_mode == 'run-only'
diff --git a/devops/actions/run-tests/windows/cts/action.yml b/devops/actions/run-tests/windows/cts/action.yml
index cbecf8aed832f..6be118eee85ec 100644
--- a/devops/actions/run-tests/windows/cts/action.yml
+++ b/devops/actions/run-tests/windows/cts/action.yml
@@ -8,7 +8,7 @@ inputs:
     required: false
   testing_mode:
     required: true
-  sycl_cts_artifact:
+  binaries_artifact:
     require: false
   target_devices:
     required: true
@@ -78,7 +78,7 @@ runs:
     if: always() && !cancelled() && inputs.testing_mode == 'build-only'
     uses: actions/upload-artifact@v4
     with:
-      name: ${{ inputs.sycl_cts_artifact }}
+      name: ${{ inputs.binaries_artifact }}
       path: sycl_cts_bin.tar.zst
       retention-days: ${{ inputs.retention-days }}
 
@@ -86,7 +86,7 @@ runs:
     if: inputs.testing_mode == 'run-only'
     uses: actions/download-artifact@v4
     with:
-      name: ${{ inputs.sycl_cts_artifact }}
+      name: ${{ inputs.binaries_artifact }}
 
   - name: Extract SYCL-CTS binaries
     if: inputs.testing_mode == 'run-only'