From 95a3d6973e209bfbc874598ff58ba6d7894499aa Mon Sep 17 00:00:00 2001 From: apostasie Date: Wed, 28 Aug 2024 15:25:13 -0700 Subject: [PATCH] Move testing to container v2 rc4 Signed-off-by: apostasie --- .github/workflows/test.yml | 6 +++--- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b269a3f3584..cddf04e6d69 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,10 +69,10 @@ jobs: containerd: v1.7.19 runner: "ubuntu-22.04" - ubuntu: 24.04 - containerd: v2.0.0-rc.3 + containerd: v2.0.0-rc.4 runner: "ubuntu-24.04" - ubuntu: 24.04 - containerd: v2.0.0-rc.3 + containerd: v2.0.0-rc.4 runner: github-arm64-2c-8gb env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" @@ -179,7 +179,7 @@ jobs: rootlesskit: v2.3.1 target: test-integration-rootless - ubuntu: 24.04 - containerd: v2.0.0-rc.3 + containerd: v2.0.0-rc.4 rootlesskit: v2.3.1 target: test-integration-rootless - ubuntu: 24.04 diff --git a/Dockerfile b/Dockerfile index 966a1d1ade4..89c6f58d6e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v2.0.0-rc.3 +ARG CONTAINERD_VERSION=v2.0.0-rc.4 ARG RUNC_VERSION=v1.1.13 ARG CNI_PLUGINS_VERSION=v1.5.1