Skip to content

Commit 06f0abb

Browse files
committed
Replace upload_artifact input with e2e_testing_mode
1 parent d38dce2 commit 06f0abb

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

.github/workflows/sycl-linux-precommit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@ jobs:
8282
runner: '["Linux", "build"]'
8383
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:alldeps
8484
image_options: -u 1001
85-
extra_lit_opts: --param test-mode=build-only
8685
ref: ${{ github.sha }}
8786
merge_ref: ''
8887
sycl_toolchain_artifact: sycl_linux_default
8988
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
9089
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
91-
upload_artifact: 'true'
90+
e2e_testing_mode: 'build-only'
9291
run_prebuilt_e2e_tests:
9392
needs: [build, build_e2e_tests]
9493
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
@@ -110,14 +109,15 @@ jobs:
110109
image: ${{ matrix.image }}
111110
image_options: ${{ matrix.image_options }}
112111
target_devices: ${{ matrix.target_devices }}
113-
extra_lit_opts: --param test-mode=run-only ${{ matrix.extra_lit_opts }}
112+
extra_lit_opts: ${{ matrix.extra_lit_opts }}
114113
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
115114
ref: ${{ github.sha }}
116115
merge_ref: ''
117116
sycl_toolchain_artifact: sycl_linux_default
118117
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
119118
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
120119
e2e_binaries_artifact: sycl_e2e_bin_default
120+
e2e_testing_mode: 'run-only'
121121

122122
test:
123123
needs: [build, detect_changes, determine_arc_tests]

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ on:
6464
default: ''
6565
required: False
6666

67-
upload_artifact:
67+
e2e_testing_mode:
6868
type: string
69-
default: 'false'
69+
default: 'full'
7070
artifact_suffix:
7171
type: string
7272
default: 'default'
@@ -159,11 +159,11 @@ on:
159159
options:
160160
- false
161161
- true
162-
upload_artifact:
162+
e2e_testing_mode:
163163
type: choice
164164
options:
165-
- "false"
166-
- "true"
165+
- "full"
166+
- "build-only"
167167

168168
permissions:
169169
contents: read
@@ -321,7 +321,9 @@ jobs:
321321
shell: bash {0}
322322
if: inputs.tests_selector == 'e2e'
323323
env:
324-
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
324+
LIT_OPTS: |
325+
-v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests
326+
--param test-mode=${{ inputs.e2e_testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
325327
run: |
326328
ninja -C build-e2e check-sycl-e2e > e2e.log 2>&1
327329
exit_code=$?
@@ -409,10 +411,10 @@ jobs:
409411
410412
exit $ret
411413
- name: Pack e2e binaries
412-
if: ${{ always() && !cancelled() && inputs.upload_artifact == 'true'}}
414+
if: ${{ always() && !cancelled() && inputs.e2e_testing_mode == 'build-only'}}
413415
run: tar -I 'zstd -9' -cf e2e_binaries.tar.zst -C ./build-e2e .
414416
- name: Upload e2e binaries
415-
if: ${{ always() && !cancelled() && inputs.upload_artifact == 'true'}}
417+
if: ${{ always() && !cancelled() && inputs.e2e_testing_mode == 'build-only'}}
416418
uses: actions/upload-artifact@v4
417419
with:
418420
name: sycl_e2e_bin_${{ inputs.artifact_suffix }}

0 commit comments

Comments
 (0)