Skip to content

Commit

Permalink
Update containerd (1.7.25) in CI
Browse files Browse the repository at this point in the history
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
  • Loading branch information
austinvazquez committed Jan 13, 2025
1 parent b854127 commit 6ab1907
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: containerd/containerd
ref: "v1.7.24"
ref: "v1.7.25"
path: containerd
fetch-depth: 1
- name: "Set up CNI"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
containerd: v1.6.36
arch: amd64
- runner: ubuntu-24.04
containerd: v1.7.24
containerd: v1.7.25
arch: amd64
- runner: ubuntu-24.04
containerd: v2.0.1
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: containerd/containerd
ref: v1.7.24
ref: v1.7.25
path: containerd
fetch-depth: 1
- if: ${{ matrix.goos=='windows' }}
Expand All @@ -109,7 +109,7 @@ jobs:
runner: "ubuntu-20.04"
arch: amd64
- ubuntu: 22.04
containerd: v1.7.24
containerd: v1.7.25
runner: "ubuntu-22.04"
arch: amd64
- ubuntu: 24.04
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
target: rootless
arch: amd64
- ubuntu: 22.04
containerd: v1.7.24
containerd: v1.7.25
rootlesskit: v2.3.1
target: rootless
arch: amd64
Expand All @@ -244,7 +244,7 @@ jobs:
target: rootless
arch: amd64
- ubuntu: 24.04
containerd: v1.7.24
containerd: v1.7.25
rootlesskit: v2.3.1
target: rootless-port-slirp4netns
arch: amd64
Expand Down Expand Up @@ -374,15 +374,15 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: containerd/containerd
ref: v1.7.24
ref: v1.7.25
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.24
ctrdVersion: 1.7.25
run: powershell hack/configure-windows-ci.ps1
- name: "Run integration tests"
run: ./hack/test-integration.sh -test.only-flaky=false
Expand Down

0 comments on commit 6ab1907

Please sign in to comment.