From 48b478381e92c9f6a13b1f587cd00d77f598210e Mon Sep 17 00:00:00 2001 From: "Paul \"TBBle\" Hampson" Date: Sun, 6 Mar 2022 15:51:40 +1100 Subject: [PATCH] Skip most of script/setup/prepare_env_windows.ps1 Apart from crictl and go-junit-report, this script is just making the remote test VMs look like GitHub Actions VMs, i.e. git, make-mingw32, golang. And we don't use go-junit-report, so we can save a lot of time (about five minutes) by just extracting the interesting part. Signed-off-by: Paul "TBBle" Hampson --- .github/workflows/ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46cc0c35b..8e2b005e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -230,7 +230,7 @@ jobs: integration-windows: name: Windows Integration runs-on: ${{ matrix.os }} - timeout-minutes: 55 + timeout-minutes: 50 needs: [project, linters, protos, man] env: GOTEST: gotestsum -- @@ -306,12 +306,14 @@ jobs: webServerTestImage: ${{ env.WEBSERVER_TESTING_IMAGE_REF }} EOF - - name: Set env for prepare_env_windows.ps1 - shell: bash - run: echo "HOME=${USERPROFILE}" >> $GITHUB_ENV - - - shell: powershell - run: script/setup/prepare_env_windows.ps1 + - name: Get crictl tool + shell: powershell + run: | + # Get critctl tool. Used for cri-integration tests + $CRICTL_DOWNLOAD_URL="https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.21.0/crictl-v1.21.0-windows-amd64.tar.gz" + curl.exe -L $CRICTL_DOWNLOAD_URL -o c:\crictl.tar.gz + tar -xvf c:\crictl.tar.gz + mv crictl.exe "${{ github.workspace }}/bin/crictl.exe" # Move crictl somewhere in path - run: script/setup/install-gotestsum - name: Tests