From e9521875807574eb7515bf8e9441536b0b4b1f28 Mon Sep 17 00:00:00 2001
From: Andrei Elovikov <andrei.elovikov@intel.com>
Date: Tue, 11 Jul 2023 09:47:23 -0700
Subject: [PATCH 1/2] [CI] Use cached_checkouts for E2E tests on Linux

---
 .github/workflows/linux_matrix_e2e_on_nightly.yml |  4 ++++
 .github/workflows/linux_single_e2e.yml            | 14 +++++++++-----
 .github/workflows/sycl_linux_build_and_test.yml   |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux_matrix_e2e_on_nightly.yml b/.github/workflows/linux_matrix_e2e_on_nightly.yml
index db1c4f213351d..880d8d70da423 100644
--- a/.github/workflows/linux_matrix_e2e_on_nightly.yml
+++ b/.github/workflows/linux_matrix_e2e_on_nightly.yml
@@ -52,6 +52,8 @@ jobs:
       target_devices: ${{ matrix.target_devices }}
       ref: ${{ inputs.ref }}
       reset_gpu: ${{ matrix.reset_gpu }}
+      # TODO: should we do the merge?
+      merge: false
 
   aws_start:
     name: AWS Start
@@ -74,6 +76,8 @@ jobs:
       target_devices: all
       ref: ${{ inputs.ref }}
       reset_gpu: false
+      # TODO: should we do the merge?
+      merge: false
 
   aws_stop:
     name: AWS Stop
diff --git a/.github/workflows/linux_single_e2e.yml b/.github/workflows/linux_single_e2e.yml
index a327dcd448570..40ec7b558595a 100644
--- a/.github/workflows/linux_single_e2e.yml
+++ b/.github/workflows/linux_single_e2e.yml
@@ -19,6 +19,8 @@ on:
         type: string
       reset_gpu:
         type: string
+      merge:
+        type: string
 
       sycl_toolchain_artifact:
         type: string
@@ -50,13 +52,15 @@ jobs:
         sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
     - uses: actions/checkout@v3
       with:
-        path: llvm
         ref: ${{ inputs.ref }}
         sparse-checkout: |
           devops/actions
-          devops/scripts/get_release.py
-          sycl/test-e2e
-          llvm/utils
+    - uses: ./devops/actions/cached_checkout
+      with:
+        path: llvm
+        ref: ${{ inputs.ref }}
+        cache_path: "/__w/repo_cache/"
+        merge: ${{ inputs.merge }}
     - name: Install drivers
       if: env.compute_runtime_tag != ''
       run: |
@@ -66,7 +70,7 @@ jobs:
           sudo -E /opt/install_drivers.sh --all
         fi
     - name: Register cleanup after job is finished
-      uses: ./llvm/devops/actions/cleanup
+      uses: ./devops/actions/cleanup
     - name: Source OneAPI TBB vars.sh
       shell: bash
       run: |
diff --git a/.github/workflows/sycl_linux_build_and_test.yml b/.github/workflows/sycl_linux_build_and_test.yml
index 387cdfafa045e..5f1c49f3c7cb4 100644
--- a/.github/workflows/sycl_linux_build_and_test.yml
+++ b/.github/workflows/sycl_linux_build_and_test.yml
@@ -232,6 +232,7 @@ jobs:
       target_devices: ${{ matrix.targets }}
       ref: ${{ inputs.build_ref || github.sha }}
       reset_gpu: ${{ contains(matrix.runs-on, 'gen9') && contains(matrix.runs-on, 'Linux') }}
+      merge: ${{ inputs.merge }}
 
       sycl_toolchain_artifact: sycl_linux_${{ inputs.build_artifact_suffix }}
       sycl_toolchain_archive: ${{ inputs.artifact_archive_name }}

From d76e5974c03882c29c8d20045bf2cd606157ec54 Mon Sep 17 00:00:00 2001
From: Andrei Elovikov <andrei.elovikov@intel.com>
Date: Tue, 11 Jul 2023 11:48:15 -0700
Subject: [PATCH 2/2] Try reorder cleanups

---
 .github/workflows/linux_single_e2e.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_single_e2e.yml b/.github/workflows/linux_single_e2e.yml
index 40ec7b558595a..306c0de1a6f1c 100644
--- a/.github/workflows/linux_single_e2e.yml
+++ b/.github/workflows/linux_single_e2e.yml
@@ -55,6 +55,8 @@ jobs:
         ref: ${{ inputs.ref }}
         sparse-checkout: |
           devops/actions
+    - name: Register cleanup after job is finished
+      uses: ./devops/actions/cleanup
     - uses: ./devops/actions/cached_checkout
       with:
         path: llvm
@@ -69,8 +71,6 @@ jobs:
           sudo cp llvm/devops/scripts/get_release.py /opt/
           sudo -E /opt/install_drivers.sh --all
         fi
-    - name: Register cleanup after job is finished
-      uses: ./devops/actions/cleanup
     - name: Source OneAPI TBB vars.sh
       shell: bash
       run: |