Skip to content

Commit 36f40ed

Browse files
authored
[CI][CTS] Add fixed ref for cts (#17074)
This patch adds a new input to fix the specific version of cts. In general it's needed for sycl-rel as the cts is continuously changing.
1 parent b512633 commit 36f40ed

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/workflows/sycl-linux-run-tests.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,17 @@ on:
3838
ref:
3939
type: string
4040
required: True
41+
description: |
42+
Commit SHA or branch to checkout the intel/llvm repo.
4143
devops_ref:
4244
type: string
4345
required: False
4446
description: |
45-
By default we checkout the devops directory from "inputs.ref" branch.
46-
devops_ref may be specified to checkout the devops dir from different
47-
branch.
48-
Note: it doesn't affect ./devops/actions/run-tests/* as these actions
49-
call checkout again and therefore override the devops directory, so
50-
configs/dependecies from input.ref are used.
47+
Commit SHA or branch to checkout the devops directory.
48+
tests_ref:
49+
type: string
50+
required: False
51+
description: Commit SHA or branch to checkout e2e/cts tests.
5152

5253
sycl_toolchain_artifact:
5354
type: string
@@ -298,7 +299,7 @@ jobs:
298299
if: inputs.tests_selector == 'e2e'
299300
uses: ./devops/actions/run-tests/e2e
300301
with:
301-
ref: ${{ inputs.ref || github.sha }}
302+
ref: ${{ inputs.tests_ref || inputs.ref || github.sha }}
302303
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
303304
testing_mode: ${{ inputs.e2e_testing_mode }}
304305
extra_cmake_args: ${{ inputs.extra_cmake_args }}
@@ -310,6 +311,7 @@ jobs:
310311
if: inputs.tests_selector == 'cts'
311312
uses: ./devops/actions/run-tests/cts
312313
with:
314+
ref: ${{ inputs.tests_ref || 'main' }}
313315
extra_cmake_args: ${{ inputs.extra_cmake_args }}
314316
cts_testing_mode: ${{ inputs.cts_testing_mode }}
315317
sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}

devops/actions/run-tests/cts/action.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: 'Run SYCL CTS tests'
22

33
inputs:
4+
ref:
5+
description: "Commit SHA or branch to checkout tests"
6+
required: false
7+
default: "main"
48
extra_cmake_args:
59
required: false
610
cts_testing_mode:
@@ -21,8 +25,7 @@ runs:
2125
with:
2226
path: khronos_sycl_cts
2327
repository: 'KhronosGroup/SYCL-CTS'
24-
ref: 'main'
25-
default_branch: 'main'
28+
ref: ${{ inputs.ref }}
2629
cache_path: "/__w/repo_cache/"
2730
- name: SYCL CTS GIT submodules init
2831
if: inputs.cts_testing_mode != 'run-only'

0 commit comments

Comments
 (0)