Container with pre-built E2E

aelovikov-intel · aelovikov-intel · commit cec84726512a · 2025-08-04T10:52:46.000-07:00
diff --git a/.github/workflows/sycl-containers.yaml b/.github/workflows/sycl-containers.yaml
@@ -1,90 +1,101 @@
-name: CI Containers
+name: Create container with pre-built tests
+
 on:
   workflow_dispatch:
-  schedule:
-    # Every 1st and 15th day of month
-    - cron: '0 0 1,15 * *'
-  push:
-    branches:
-      - sycl
-    paths:
-      - 'devops/actions/build_container/**'
-      - 'devops/containers/**'
-      - 'devops/dependencies.json'
-      - 'devops/scripts/install_drivers.sh'
-      - 'devops/scripts/install_build_tools.sh'
-      - '.github/workflows/sycl-containers.yaml'
-  pull_request:
-    paths:
-      - 'devops/actions/build_container/**'
-      - 'devops/containers/**'
-      - 'devops/dependencies.json'
-      - 'devops/scripts/install_drivers.sh'
-      - 'devops/scripts/install_build_tools.sh'
-      - '.github/workflows/sycl-containers.yaml'
+    inputs:
+      ref:
+        type: string
+        description: tag/sha
+        required: true
+        default: nightly-2025-07-18
 
 permissions: read-all
 
 jobs:
-  build_and_push_images:
-    if: github.repository == 'intel/llvm'
-    name: Build and Push Docker Images
-    runs-on: ubuntu-latest
+  build:
+    uses: ./.github/workflows/sycl-linux-build.yml
+    with:
+      build_ref: ${{ inputs.ref }}
+      build_cache_root: "/__w/"
+
+      build_image: "ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest"
+      cc: clang
+      cxx: clang++
+
+      changes: '[]'
+
+      toolchain_artifact: toolchain
+      toolchain_artifact_filename: toolchain.tar.zst
+      e2e_binaries_artifact: e2e_bin
+
+  # Couldn't make it work from inside the container, so have to use an extra job
+  # and pass an artifact.
+  docker:
+    runs-on: [Linux, build]
+    needs: build
     permissions:
       packages: write
-    strategy:
-      matrix:
-        include:
-          - name: Base Ubuntu 22.04 Docker image
-            file: ubuntu2204_base
-            tag: latest
-            build_args: ""
-          - name: Base Ubuntu 24.04 Docker image
-            file: ubuntu2404_base
-            tag: latest
-            build_args: ""
-          - name: Build Ubuntu 22.04 Docker image
-            file: ubuntu2204_build
-            tag: latest
-            build_args: ""
-          - name: Build Ubuntu 24.04 Docker image
-            file: ubuntu2404_build
-            tag: latest
-            build_args: ""
-          - name: Intel Drivers Ubuntu 22.04 Docker image
-            file: ubuntu2204_intel_drivers
-            tag: latest
-            build_args: ""
-          - name: Intel Drivers Ubuntu 24.04 Docker image
-            file: ubuntu2404_intel_drivers
-            tag: latest
-            build_args: ""
-          - name: Build + Intel Drivers Ubuntu 22.04 Docker image
-            file: ubuntu2204_intel_drivers
-            tag: alldeps
-            build_args: |
-              base_image=ghcr.io/intel/llvm/ubuntu2204_build
-              base_tag=latest
-          - name: Build + Intel Drivers Ubuntu 24.04 Docker image
-            file: ubuntu2404_intel_drivers
-            tag: alldeps
-            build_args: |
-              base_image=ghcr.io/intel/llvm/ubuntu2404_build
-              base_tag=latest
+    if: always()
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            devops/
+
+      - uses: actions/checkout@v4
         with:
-          fetch-depth: 2
-      - name: Build and Push Container
+          ref: ${{ inputs.ref }}
+          path: llvm
+          sparse-checkout: |
+              llvm/utils/lit
+              sycl/test-e2e
+      - name: Pack sources
+        run: |
+          tar -I 'zstd -9' -cf devops/e2e_sources.tar.zst -C ./llvm .
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: toolchain
+          path: devops/
+      - uses: actions/download-artifact@v4
+        with:
+          name: e2e_bin
+          path: devops/
+
+
+      - name: Build container
         uses: ./devops/actions/build_container
         with:
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ${{ matrix.file }}
+          push: true
+          file: release_tests_binaries
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}-${{ github.sha }}
-            ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}
-          build-args: ${{ matrix.build_args }}
+            ghcr.io/${{ github.repository }}/sycl_prebuilt_tests:${{ inputs.ref }}
 
+  run-e2e:
+    runs-on: [Linux, pvc]
+    needs: [docker, build]
+    if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
+    container:
+      image: ghcr.io/${{ github.repository }}/sycl_prebuilt_tests:${{ inputs.ref }}
+      options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            devops
+      - run: |
+          mkdir toolchain
+          tar -I 'zstd' -xf /sycl-prebuilt/toolchain.tar.zst -C toolchain
+          echo LD_LIBRARY_PATH=$PWD/toolchain/lib:$LD_LIBRARY_PATH >> $GITHUB_ENV
+          echo PATH=$PWD/toolchain/bin:$PATH >> $GITHUB_ENV
+      - run: |
+          sycl-ls
+      - name: Run E2E tests
+        uses: ./devops/actions/run-tests/e2e
+        timeout-minutes: 60
+        with:
+          ref: ${{ inputs.ref }}
+          testing_mode: run-only
+          target_devices: level_zero:gpu
diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml
@@ -37,7 +37,7 @@ on:
 
       repo_ref:
         type: string
-        required: True
+        required: False
         description: |
           Commit SHA or branch to checkout the intel/llvm repo.
       tests_ref:
@@ -60,9 +60,10 @@ on:
 
       e2e_binaries_artifact:
         description: |
-          Must be set if `e2e_testing_mode` is equal to `run-only` and the
-          artifact must exist. Can be set in other modes resulting in artifact
-          upload.
+          When set in modes other than `run-only` results in artifact upload.
+          For `run-only` mode, if specified, means downloading pre-built
+          binaries from the artifact, otherwise they are expected to be part of
+          the container.
         type: string
         default: ''
         required: False
@@ -144,17 +145,21 @@ on:
       runner:
         type: choice
         options:
+          - '["Linux", "pvc"]'
           - '["Linux", "gen12"]'
           - '["amdgpu"]'
           - '["Linux", "arc"]'
-          - '["Linux", "pvc"]'
           - '["cts-cpu"]'
           - '["Linux", "build"]'
           - '["cuda"]'
           - '["PVC_PERF"]'
       image:
         type: choice
         options:
+          - 'ghcr.io/intel/llvm/sycl_prebuilt_tests:sycl-rel-6_2'
+          - 'ghcr.io/intel/llvm/sycl_prebuilt_tests:v6.1.0'
+          - 'ghcr.io/intel/llvm/sycl_prebuilt_tests:nightly-2025-06-20'
+          - 'ghcr.io/intel/llvm/sycl_prebuilt_tests:nightly-2025-07-18'
           - 'ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest'
           - 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'
       image_options:
@@ -205,6 +210,7 @@ on:
         options:
           - "full"
           - "build-only"
+          - "run-only"
 
 permissions:
   contents: read
diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml
@@ -24,26 +24,34 @@ runs:
   using: "composite"
   steps:
   - name: Checkout E2E tests
+    if: ${{ inputs.testing_mode != 'run-only'  || inputs.binaries_artifact }}
     uses: actions/checkout@v4
     with:
       path: llvm
       ref: ${{ inputs.ref || github.sha }}
       sparse-checkout: |
         llvm/utils/lit
         sycl/test-e2e
-
   - name: Download E2E Binaries
-    if: inputs.testing_mode == 'run-only'
+    if: ${{ inputs.testing_mode == 'run-only'  && inputs.binaries_artifact != '' }}
     uses: actions/download-artifact@v4
     with:
       name: ${{ inputs.binaries_artifact }}
   - name: Extract E2E Binaries
-    if: inputs.testing_mode == 'run-only'
+    if: ${{ inputs.testing_mode == 'run-only'  && inputs.binaries_artifact != '' }}
     shell: bash
     run: |
       mkdir build-e2e
       tar -I 'zstd' -xf e2e_binaries.tar.zst -C build-e2e
 
+  - name: Extract E2E tests from container image
+    if: ${{ inputs.testing_mode == 'run-only'  && inputs.binaries_artifact == '' }}
+    shell: bash
+    run: |
+      mkdir build-e2e llvm
+      tar -I 'zstd' -xf /sycl-prebuilt/e2e_binaries.tar.zst -C build-e2e
+      tar -I 'zstd' -xf /sycl-prebuilt/e2e_sources.tar.zst -C llvm
+
   - name: Deduce E2E CMake options
     if: inputs.testing_mode != 'run-only'
     id: cmake_opts
diff --git a/devops/containers/release_tests_binaries.Dockerfile b/devops/containers/release_tests_binaries.Dockerfile
@@ -0,0 +1,26 @@
+ARG base_tag=alldeps
+ARG base_image=ghcr.io/intel/llvm/ubuntu2404_intel_drivers
+
+FROM $base_image:$base_tag
+
+# Actual CI maps volumes via something like "/runner/host/path":"/__w/", so
+# these won't be visible there. They can be used when manually reproducing
+# issues though. Path `/__w/llvm/llvm` is the property of Github Actions and
+# when CMake configures E2E tests this path is hardcoded in both CMake files and
+# e2e binaries themselve. As such, it's useful to have these in the image for
+# local manual experiments.
+#
+# One can map volumes as "/host/system/new/toolchain":"/__w/llvm/llvm/toolchain"
+# to override the toolchain in order to run the tests with local SYCL RT instead
+# of using the release RT included in this image.
+ADD --chown=sycl:sycl toolchain.tar.zst /__w/llvm/llvm/toolchain
+ADD --chown=sycl:sycl e2e_binaries.tar.zst /__w/llvm/llvm/build-e2e
+ADD --chown=sycl:sycl e2e_sources.tar.zst /__w/llvm/llvm/llvm
+
+# Since `/__w/llvm/llvm` above is overriden by GHA, need to provide the
+# following for using in CI:
+COPY e2e_binaries.tar.zst /sycl-prebuilt/
+COPY e2e_sources.tar.zst /sycl-prebuilt/
+COPY toolchain.tar.zst /sycl-prebuilt/
+
+COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
