Skip to content

[CI][CTS] Add fixed ref for cts #17074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/workflows/sycl-linux-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
7 changes: 5 additions & 2 deletions devops/actions/run-tests/cts/action.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -21,8 +25,7 @@ runs:
with:
path: khronos_sycl_cts
repository: 'KhronosGroup/SYCL-CTS'
ref: 'main'
default_branch: 'main'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot to mention - deleting this as it's not used at all.

ref: ${{ inputs.ref }}
cache_path: "/__w/repo_cache/"
- name: SYCL CTS GIT submodules init
if: inputs.cts_testing_mode != 'run-only'
Expand Down
Loading