Skip to content

Commit ed4e5e1

Browse files
committed
Remove temporary work around and bump containerd versions
Signed-off-by: James Sturtevant <jstur@microsoft.com>
1 parent e559735 commit ed4e5e1

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
strategy:
9090
matrix:
9191
os: [ubuntu-20.04, ubuntu-22.04]
92-
containerd: [v1.6.21, v1.7.1]
92+
containerd: [v1.6.24, v1.7.6]
9393

9494
steps:
9595
- name: Checkout extensions
@@ -132,13 +132,8 @@ jobs:
132132
GOPROXY: direct
133133
TEST_RUNTIME: "io.containerd.runc.v2-rs"
134134
TESTFLAGS_PARALLEL: 1
135-
EXTRA_TESTFLAGS: "-no-criu -test.skip='(TestContainerPTY|TestContainerExecLargeOutputWithTTY)'"
135+
EXTRA_TESTFLAGS: "-no-criu -test.skip='(TestContainerPTY|TestContainerExecLargeOutputWithTTY|TestTaskUpdate|TestTaskResize)'"
136136
TESTFLAGS_RACE: "-race"
137137
run: |
138-
# https://github.com/containerd/rust-extensions/issues/147#issuecomment-1684553369
139-
cd integration/client
140-
sudo -E PATH=$PATH go mod edit -dropreplace github.com/AdaLogics/go-fuzz-headers
141-
sudo -E PATH=$PATH go get -u github.com/AdaLogics/go-fuzz-headers
142-
cd ../..
143138
sudo -E PATH=$PATH make integration
144139
working-directory: src/github.com/containerd/containerd

0 commit comments

Comments
 (0)