From 7a115a14538f4bf1ed44a678b4567ff028f80a0e Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 24 Aug 2023 19:24:14 +0000 Subject: [PATCH] Remove temporary work around and bump containerd versions Signed-off-by: James Sturtevant --- .github/workflows/ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2646fe91..8fa432c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, ubuntu-22.04] - containerd: [v1.6.21, v1.7.1] + containerd: [v1.6.24, v1.7.6] steps: - name: Checkout extensions @@ -132,13 +132,8 @@ jobs: GOPROXY: direct TEST_RUNTIME: "io.containerd.runc.v2-rs" TESTFLAGS_PARALLEL: 1 - EXTRA_TESTFLAGS: "-no-criu -test.skip='(TestContainerPTY|TestContainerExecLargeOutputWithTTY)'" + EXTRA_TESTFLAGS: "-no-criu -test.skip='(TestContainerPTY|TestContainerExecLargeOutputWithTTY|TestTaskUpdate|TestTaskResize)'" TESTFLAGS_RACE: "-race" run: | - # https://github.com/containerd/rust-extensions/issues/147#issuecomment-1684553369 - cd integration/client - sudo -E PATH=$PATH go mod edit -dropreplace github.com/AdaLogics/go-fuzz-headers - sudo -E PATH=$PATH go get -u github.com/AdaLogics/go-fuzz-headers - cd ../.. sudo -E PATH=$PATH make integration working-directory: src/github.com/containerd/containerd