diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 7a4dd382e8bca..52a07a817e69c 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -38,16 +38,17 @@ on: ref: type: string required: True + description: | + Commit SHA or branch to checkout the intel/llvm repo. devops_ref: type: string required: False description: | - By default we checkout the devops directory from "inputs.ref" branch. - devops_ref may be specified to checkout the devops dir from different - branch. - Note: it doesn't affect ./devops/actions/run-tests/* as these actions - call checkout again and therefore override the devops directory, so - configs/dependecies from input.ref are used. + Commit SHA or branch to checkout the devops directory. + tests_ref: + type: string + required: False + description: Commit SHA or branch to checkout e2e/cts tests. sycl_toolchain_artifact: type: string @@ -297,7 +298,7 @@ jobs: if: inputs.tests_selector == 'e2e' uses: ./devops/actions/run-tests/e2e with: - ref: ${{ inputs.ref || github.sha }} + ref: ${{ inputs.tests_ref || inputs.ref || github.sha }} binaries_artifact: ${{ inputs.e2e_binaries_artifact }} testing_mode: ${{ inputs.e2e_testing_mode }} extra_cmake_args: ${{ inputs.extra_cmake_args }} @@ -309,6 +310,7 @@ jobs: if: inputs.tests_selector == 'cts' uses: ./devops/actions/run-tests/cts with: + ref: ${{ inputs.tests_ref || 'main' }} extra_cmake_args: ${{ inputs.extra_cmake_args }} cts_testing_mode: ${{ inputs.cts_testing_mode }} sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }} diff --git a/devops/actions/run-tests/cts/action.yml b/devops/actions/run-tests/cts/action.yml index 8f1b5bcbecea2..21c60b477b0de 100644 --- a/devops/actions/run-tests/cts/action.yml +++ b/devops/actions/run-tests/cts/action.yml @@ -1,6 +1,10 @@ name: 'Run SYCL CTS tests' inputs: + ref: + description: "Commit SHA or branch to checkout tests" + required: false + default: "main" extra_cmake_args: required: false cts_testing_mode: @@ -21,8 +25,7 @@ runs: with: path: khronos_sycl_cts repository: 'KhronosGroup/SYCL-CTS' - ref: 'main' - default_branch: 'main' + ref: ${{ inputs.ref }} cache_path: "/__w/repo_cache/" - name: SYCL CTS GIT submodules init if: inputs.cts_testing_mode != 'run-only'