From 0e8abacc371386a058c71012ccff3ce38d8cd123 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Thu, 21 Nov 2024 22:51:14 +0000 Subject: [PATCH] Update containerd (1.7.24) in CI Signed-off-by: Austin Vazquez --- .github/workflows/test-canary.yml | 2 +- .github/workflows/test.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-canary.yml b/.github/workflows/test-canary.yml index 75a666d32b4..152097cd0fc 100644 --- a/.github/workflows/test-canary.yml +++ b/.github/workflows/test-canary.yml @@ -82,7 +82,7 @@ jobs: - uses: actions/checkout@v4.2.2 with: repository: containerd/containerd - ref: "v1.7.23" + ref: "v1.7.24" path: containerd fetch-depth: 1 - name: "Set up CNI" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9a1f3c4f83..46405ac2f93 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: containerd: v1.6.36 arch: amd64 - runner: ubuntu-24.04 - containerd: v1.7.23 + containerd: v1.7.24 arch: amd64 - runner: ubuntu-24.04 containerd: v2.0.0 @@ -85,7 +85,7 @@ jobs: uses: actions/checkout@v4.2.2 with: repository: containerd/containerd - ref: v1.7.23 + ref: v1.7.24 path: containerd fetch-depth: 1 - if: ${{ matrix.goos=='windows' }} @@ -110,7 +110,7 @@ jobs: runner: "ubuntu-20.04" arch: amd64 - ubuntu: 22.04 - containerd: v1.7.23 + containerd: v1.7.24 runner: "ubuntu-22.04" arch: amd64 - ubuntu: 24.04 @@ -235,7 +235,7 @@ jobs: target: rootless arch: amd64 - ubuntu: 22.04 - containerd: v1.7.23 + containerd: v1.7.24 rootlesskit: v2.3.1 target: rootless arch: amd64 @@ -245,7 +245,7 @@ jobs: target: rootless arch: amd64 - ubuntu: 24.04 - containerd: v1.7.23 + containerd: v1.7.24 rootlesskit: v2.3.1 target: rootless-port-slirp4netns arch: amd64 @@ -378,7 +378,7 @@ jobs: - uses: actions/checkout@v4.2.2 with: repository: containerd/containerd - ref: v1.7.23 + ref: v1.7.24 path: containerd fetch-depth: 1 - name: "Set up CNI" @@ -386,7 +386,7 @@ jobs: run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows - name: "Set up containerd" env: - ctrdVersion: 1.7.23 + ctrdVersion: 1.7.24 run: powershell hack/configure-windows-ci.ps1 - name: "Run integration tests" run: ./hack/test-integration.sh -test.only-flaky=false