remove RUN_OPTS; dowload all artefacts

Author: alan-forbes-cp

.github/actions/do_build_sycl_cts/action.yml

@@ -8,7 +8,7 @@ inputs:
     description: '"ock" or "native_cpu"'
     default: 'ock'
   download_sycl_cts_artefact:
-    description: 'download ock artefact rather than building, of form <target>=id;<target2=id2>.'
+    description: 'download sycl_cts artefact rather than building, of form <target>=id;<target2=id2>.'
     default: ''    
 
 runs:

.github/actions/run_sycl_cts/action.yml

@@ -61,13 +61,10 @@ runs:
         SYCL_CTS_FILTER: ''
       run: |
         echo running sycl cts
-        export RUN_OPTS=""
         export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install_dpcpp/lib
         if [[ "${{inputs.sycl_device}}" = "ock" ]] ; then
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/install_ock/lib
-          export RUN_OPTS="-e OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so"
           export ONEAPI_DEVICE_SELECTOR=opencl:0
-          # ... and needed for create_sycl_cts_test_lists.sh call below ...
           export OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so
         else # native_cpu
           export ONEAPI_DEVICE_SELECTOR=native_cpu:cpu
@@ -78,7 +75,7 @@ runs:
         python3 scripts/testing/create_override_csv.py -d .github/sycl_cts/ \
              -k ${{inputs.sycl_device}} ${{inputs.sycl_device}}_${{ inputs.target }} \
              -o override_combined.csv -vv
-             
+
         exitcode=0
         set -x
         python3 $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
@@ -88,7 +85,6 @@ runs:
           -p sycl_cts \
           -b SYCL-CTS/bin \
           -L SYCL-CTS/lib \
-          $RUN_OPTS \
           -s $CTS_CSV_FILE \
           -l SYCL-CTS/cts.log -f SYCL-CTS/cts.fail \
           -r SYCL-CTS/cts.xml \

.github/workflows/planned_testing_caller.yml

@@ -40,8 +40,9 @@ jobs:
 
       # The following can be used to download from a previous workflow run (change id)
       # download_ock_artefact: host_x86_64_linux=12915462445;host_aarch64_linux=12915462445
+      download_ock_artefact: host_x86_64_linux=14080727549
       # download_dpcpp_artefact: host_x86_64_linux=12915462445;host_aarch64_linux=12915462445
-      #download_dpcpp_artefact: host_x86_64_linux=14058229649
+      download_dpcpp_artefact: host_x86_64_linux=14080727549
       # download_sycl_cts_artefact: host_x86_64_linux=12915462445;host_aarch64_linux=12915462445      
-      download_sycl_cts_artefact: host_x86_64_linux=14058229649
+      download_sycl_cts_artefact: host_x86_64_linux=14080727549
       pull_request: ${{ github.event_name == 'pull_request' }}