Skip to content

Commit

Permalink
update containerd (1.7.15)
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Apr 8, 2024
1 parent 950f6f3 commit 2cfff27
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ jobs:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.6.30
containerd: v1.6.31
- ubuntu: 20.04
containerd: v1.7.14
containerd: v1.7.15
- ubuntu: 22.04
containerd: v1.7.14
containerd: v1.7.15
- ubuntu: 22.04
containerd: main
env:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 22.04
containerd: v1.7.14
containerd: v1.7.15
env:
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
CONTAINERD_VERSION: "${{ matrix.containerd }}"
Expand Down Expand Up @@ -157,31 +157,31 @@ jobs:
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
include:
- ubuntu: 20.04
containerd: v1.6.30
containerd: v1.6.31
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.7.14
containerd: v1.7.15
rootlesskit: v2.0.2
target: test-integration-rootless
- ubuntu: 22.04
containerd: v1.7.14
containerd: v1.7.15
rootlesskit: v1.1.1
target: test-integration-rootless
- ubuntu: 22.04
containerd: main
rootlesskit: v2.0.2
target: test-integration-rootless
- ubuntu: 20.04
containerd: v1.6.30
containerd: v1.6.31
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 20.04
containerd: v1.7.14
containerd: v1.7.15
rootlesskit: v2.0.2
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
containerd: v1.7.14
containerd: v1.7.15
rootlesskit: v1.1.1
target: test-integration-rootless-port-slirp4netns
- ubuntu: 22.04
Expand Down Expand Up @@ -275,15 +275,15 @@ jobs:
- uses: actions/checkout@v4.1.2
with:
repository: containerd/containerd
ref: v1.7.14
ref: v1.7.15
path: containerd
fetch-depth: 1
- name: "Set up CNI"
working-directory: containerd
run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
- name: "Set up containerd"
env:
ctrdVersion: 1.7.14
ctrdVersion: 1.7.15
run: powershell hack/configure-windows-ci.ps1
# TODO: Run unit tests
- name: "Run integration tests"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# TODO: verify commit hash

# Basic deps
ARG CONTAINERD_VERSION=v1.7.14
ARG CONTAINERD_VERSION=v1.7.15
ARG RUNC_VERSION=v1.1.12
ARG CNI_PLUGINS_VERSION=v1.4.1

Expand Down

0 comments on commit 2cfff27

Please sign in to comment.