Skip to content

Commit a7b50b2

Browse files
authored
[CI][CTS] Checkout cts filter from testing branch (#17228)
Move cts_exclude_filter from `devops` dir to `sycl` and check it out from testing branch.
1 parent fb582a7 commit a7b50b2

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ jobs:
322322
uses: ./devops/actions/run-tests/cts
323323
with:
324324
ref: ${{ inputs.tests_ref || 'main' }}
325+
cts_exclude_ref: ${{ inputs.repo_ref }}
325326
extra_cmake_args: ${{ inputs.extra_cmake_args }}
326327
cts_testing_mode: ${{ inputs.cts_testing_mode }}
327328
sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}

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

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ name: 'Run SYCL CTS tests'
33
inputs:
44
ref:
55
description: "Commit SHA or branch to checkout tests"
6-
required: false
7-
default: "main"
6+
required: true
7+
cts_exclude_ref:
8+
description: "Commit SHA or branch to checkout the cts_exclude_filter dir"
9+
required: true
810
extra_cmake_args:
911
required: false
1012
cts_testing_mode:
@@ -19,6 +21,18 @@ inputs:
1921
runs:
2022
using: "composite"
2123
steps:
24+
- name: Checkout cts_exclude_filter folder
25+
uses: actions/checkout@v4
26+
with:
27+
ref: ${{ inputs.cts_exclude_ref }}
28+
path: cts_exclude
29+
sparse-checkout: |
30+
sycl/cts_exclude_filter
31+
- name: Move sycl to root
32+
shell: bash
33+
run: |
34+
mv cts_exclude/sycl .
35+
rm -rf cts_exclude
2236
- name: Checkout SYCL CTS tests
2337
if: inputs.cts_testing_mode != 'run-only'
2438
uses: ./devops/actions/cached_checkout
@@ -42,11 +56,11 @@ runs:
4256
# If CTS_TESTS_TO_BUILD is null - use filter
4357
if [ -z "$CTS_TESTS_TO_BUILD" ]; then
4458
if [ "${{ contains(inputs.cts_testing_mode, 'build-only') }}" = "true" ]; then
45-
cts_exclude_filter=$PWD/devops/cts_exclude_filter_compfails
59+
cts_exclude_filter=$PWD/sycl/cts_exclude_filter/compfails
4660
elif [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then
47-
cts_exclude_filter=$PWD/devops/cts_exclude_filter_OCL_CPU
61+
cts_exclude_filter=$PWD/sycl/cts_exclude_filter/OCL_CPU
4862
elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
49-
cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU
63+
cts_exclude_filter=$PWD/sycl/cts_exclude_filter/L0_GPU
5064
fi
5165
5266
# List excluded SYCL CTS categories:
@@ -105,8 +119,8 @@ runs:
105119
106120
# If the suite was built on another machine then the build contains the full
107121
# set of tests. We have special files to filter out some test categories,
108-
# see "devops/cts_exclude_filter_*". Each configuration has its own file, e.g.
109-
# there is "cts_exclude_filter_OCL_CPU" for opencl:cpu device. Therefore,
122+
# see "sycl/cts_exclude_filter/*". Each configuration has its own file, e.g.
123+
# there is "cts_exclude_filter/OCL_CPU" for opencl:cpu device. Therefore,
110124
# these files may differ from each other, so when there is a pre-built set of
111125
# tests, we need to filter it according to the filter-file.
112126
- name: Filter SYCL CTS test categories
@@ -115,9 +129,9 @@ runs:
115129
run: |
116130
cts_exclude_filter=""
117131
if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then
118-
cts_exclude_filter=$PWD/devops/cts_exclude_filter_OCL_CPU
132+
cts_exclude_filter=$PWD/sycl/cts_exclude_filter/OCL_CPU
119133
elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
120-
cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU
134+
cts_exclude_filter=$PWD/sycl/cts_exclude_filter/L0_GPU
121135
fi
122136
123137
while IFS= read -r line; do
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)