github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-08 11:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10876 from lifupan/fupan_containerd

Browse Source 
ci: cri-containerd: upgrade the LTS / Active versions for containerd
This commit is contained in:
Xuewei Niu 2025-03-06 17:08:40 +08:00 committed by GitHub
commit 644af52968
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/basic-ci-amd64.yaml vendored
View File

@ -63,15 +63,13 @@ jobs:
# all the tests due to a single flaky instance. # all the tests due to a single flaky instance.
fail-fast: false fail-fast: false
matrix: matrix:
containerd_version: ['latest'] containerd_version: ['active']
vmm: ['dragonball', 'cloud-hypervisor', 'qemu-runtime-rs'] vmm: ['dragonball', 'cloud-hypervisor', 'qemu-runtime-rs']
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
CONTAINERD_VERSION: ${{ matrix.containerd_version }} CONTAINERD_VERSION: ${{ matrix.containerd_version }}
GOPATH: ${{ github.workspace }} GOPATH: ${{ github.workspace }}
KATA_HYPERVISOR: ${{ matrix.vmm }} KATA_HYPERVISOR: ${{ matrix.vmm }}
#the latest containerd from 2.0 need to set the CGROUP_DRIVER for e2e testing
CGROUP_DRIVER: ""
SANDBOXER: "shim" SANDBOXER: "shim"
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

3
tests/integration/cri-containerd/integration-tests.sh
View File

@ -20,6 +20,9 @@ export PATH="$PATH:/usr/local/sbin"
# golang is installed in /usr/local/go/bin/ add that path # golang is installed in /usr/local/go/bin/ add that path
export PATH="$PATH:/usr/local/go/bin" export PATH="$PATH:/usr/local/go/bin"
#the latest containerd from 2.0 need to set the CGROUP_DRIVER for e2e testing
export CGROUP_DRIVER=""
# Runtime to be used for testing # Runtime to be used for testing
KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}" KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}"
RUNTIME=${RUNTIME:-containerd-shim-kata-${KATA_HYPERVISOR}-v2} RUNTIME=${RUNTIME:-containerd-shim-kata-${KATA_HYPERVISOR}-v2}

9
versions.yaml
View File

@ -261,10 +261,11 @@ externals:
# containerd from v1.5.0 used the path unix socket # containerd from v1.5.0 used the path unix socket
# instead of abstract socket, thus kata wouldn's support the containerd's # instead of abstract socket, thus kata wouldn's support the containerd's
# version older than them. # version older than them.
version: "v1.6.8" version: "v1.7.25"
lts: "v1.6" lts: "v1.7"
active: "v1.7" active: "v2.0"
# add containerd 2.0.0 for sandbox api test # keep the latest version to make the current PR ci work, once it was
# merged,we can remove the latest version.
latest: "v2.0" latest: "v2.0"
critools: critools: