Enabled Linux UVM tests to run on 1ES github runner pool

Signed-off-by: Jie Chen <[email protected]>
microsoft · Jan 14, 2025 · 0d1837b · 0d1837b
1 parent 1bb326a
commit 0d1837b
Showing 1 changed file with 19 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,33 +50,6 @@ jobs:
         overwrite: true
         retention-days: 1
 
-  download-boot-files:
-    needs: create-linux-boot-files
-    runs-on: [self-hosted, 1ES.Pool=containerplat-github-runner-pool-east-us-2, 1ES.ImageOverride=github-mms-ws2022-containers-enabled]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          show-progress: false
-
-      - name: Create directory for boot files
-        shell: pwsh
-        run: mkdir -p ${{ github.workspace }}/LinuxBootFiles/
-
-      - name: Download boot files from artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: linux_bootfiles.tar
-          path: ${{ github.workspace }}/LinuxBootFiles/
-
-      - name: Display downloaded linux boot files
-        shell: pwsh
-        run: |
-          Get-ChildItem -Recurse -Force -Path ${{ github.workspace }}/LinuxBootFiles/
-          tar.exe xf ${{ github.workspace }}/LinuxBootFiles/linux_bootfiles.tar -C ${{ github.workspace }}/LinuxBootFiles/
-          Get-ChildItem -Recurse -Force -Path ${{ github.workspace }}/LinuxBootFiles/
-          # Remove-Item -Path ${{ github.workspace }}/LinuxBootFiles/linux_bootfiles.tar -Force
-
   lint:
     runs-on: "windows-2022"
     strategy:
@@ -331,7 +304,7 @@ jobs:
 
   test-windows:
     name: test-windows (${{ matrix.name }})
-    needs: [lint, protos, verify-vendor, go-gen]
+    needs: [lint, protos, verify-vendor, go-gen, create-linux-boot-files]
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
@@ -408,6 +381,22 @@ jobs:
           ${{ env.GOTESTSUM_CMD_RAW }} ./containerd-shim-runhcs-v1.test.exe '-test.v'
         working-directory: test
 
+      # Download Linux kernel files and newly created rootfs containing Linux-GCS from uploaded artifacts
+      - name: Create directory for Linux boot files
+        shell: pwsh
+        run: mkdir -p ${{ github.workspace }}/LinuxBootFiles/
+
+      - name: Download boot files from artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: linux_bootfiles.tar
+          path: ${{ github.workspace }}/LinuxBootFiles/
+
+      - name: Display downloaded Linux boot files
+        shell: pwsh
+        run: |
+          Get-ChildItem -Recurse -Force -Path ${{ github.workspace }}/LinuxBootFiles/
+
       - name: Build and run functional testing binary
         run: |
           ${{ env.GO_BUILD_TEST_CMD }} ./functional
@@ -424,8 +413,8 @@ jobs:
             exit $LASTEXITCODE
           }
 
-          # Don't run Linux uVM (ie, nested virt) or LCOW integrity tests. Windows uVM tests will be run on 1ES runner pool.
-          $cmd = '${{ env.GOTESTSUM_CMD_RAW }} ./functional.test.exe -exclude=LCOW,LCOWIntegrity -test.timeout=1h -test.v -log-level=info'
+          # Don't run LCOW integrity tests. Windows/Linux uVM tests will be run on 1ES Github Runner Pool.
+          $cmd = '${{ env.GOTESTSUM_CMD_RAW }} ./functional.test.exe -linux-bootfiles=./LinuxBootFiles -exclude=LCOWIntegrity -test.timeout=1h -test.v -log-level=info'
           $cmd = $cmd -replace 'gotestsum', $gotestsum
           Write-Host "gotestsum command: $cmd"