github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-01 06:28:11 +00:00
Code Issues Projects Releases Wiki Activity

versions: bump containerd to 2.3 and define minimum/latest test matrix

Browse Source 
Bump the containerd version used by CI from v1.7.25 to v2.3.0.

Rename the version-range fields in versions.yaml and throughout the
GitHub Actions workflows from lts/active/version/sandbox_api to
minimum/latest to make their meaning self-evident:

  minimum: "v1.7"   # oldest containerd branch under test
  latest:  "v2.3"   # newest containerd branch under test

Drop the bare version field (superseded by the matrix) and the
sandbox_api alias (covered by latest).  Update all containerd_version
matrix entries in the workflow files accordingly, and update
gha-run-k8s-common.sh to resolve the new key names.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
Assisted-by: Cursor <noreply@cursor.com>
This commit is contained in:
Fabiano Fidêncio
2026-06-07 21:54:18 +02:00
parent a4138794ea
commit e122d7ffb0
8 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ jobs:
# all the tests due to a single flaky instance.
fail-fast: false
matrix:
containerd_version: ['sandbox_api']
containerd_version: ['latest']
vmm: ['dragonball', 'clh-runtime-rs', 'qemu-runtime-rs']
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-sandboxapi-amd64-${{ toJSON(matrix) }}
@@ -87,7 +87,7 @@ jobs:
strategy:
fail-fast: false
matrix:
containerd_version: ['lts', 'active']
containerd_version: ['minimum', 'latest']
vmm: ['clh', 'clh-runtime-rs', 'dragonball', 'qemu', 'qemu-runtime-rs']
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-run-containerd-stability-amd64-${{ toJSON(matrix) }}
@@ -136,7 +136,7 @@ jobs:
# all the tests due to a single flaky instance.
fail-fast: false
matrix:
containerd_version: ['lts', 'active']
containerd_version: ['minimum', 'latest']
vmm: ['clh', 'qemu', 'dragonball', 'qemu-runtime-rs']
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-run-nydus-amd64-${{ toJSON(matrix) }}

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

@@ -28,7 +28,7 @@ jobs:
# all the tests due to a single flaky instance.
fail-fast: false
matrix:
containerd_version: ['active']
containerd_version: ['minimum']
vmm: ['qemu-runtime-rs']
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-s390x-${{ toJSON(matrix) }}
@@ -94,7 +94,7 @@ jobs:
strategy:
fail-fast: false
matrix:
containerd_version: ['lts', 'active']
containerd_version: ['minimum', 'latest']
vmm: ['qemu']
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-s390x-${{ toJSON(matrix) }}

26
.github/workflows/ci.yaml vendored
View File

@@ -398,16 +398,16 @@ jobs:
fail-fast: false
matrix:
params: [
{ containerd_version: lts, vmm: clh },
{ containerd_version: lts, vmm: dragonball },
{ containerd_version: lts, vmm: qemu },
{ containerd_version: lts, vmm: clh-runtime-rs },
{ containerd_version: lts, vmm: qemu-runtime-rs },
{ containerd_version: active, vmm: clh },
{ containerd_version: active, vmm: dragonball },
{ containerd_version: active, vmm: qemu },
{ containerd_version: active, vmm: clh-runtime-rs },
{ containerd_version: active, vmm: qemu-runtime-rs },
{ containerd_version: latest, vmm: clh },
{ containerd_version: latest, vmm: dragonball },
{ containerd_version: latest, vmm: qemu },
{ containerd_version: latest, vmm: clh-runtime-rs },
{ containerd_version: latest, vmm: qemu-runtime-rs },
{ containerd_version: minimum, vmm: clh },
{ containerd_version: minimum, vmm: dragonball },
{ containerd_version: minimum, vmm: qemu },
{ containerd_version: minimum, vmm: clh-runtime-rs },
{ containerd_version: minimum, vmm: qemu-runtime-rs },
]
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-cri-amd64-${{ toJSON(matrix) }}
@@ -429,8 +429,8 @@ jobs:
fail-fast: false
matrix:
params: [
{containerd_version: active, vmm: qemu},
{containerd_version: active, vmm: qemu-runtime-rs},
{containerd_version: latest, vmm: qemu},
{containerd_version: latest, vmm: qemu-runtime-rs},
]
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-${{ toJSON(matrix) }}
@@ -452,7 +452,7 @@ jobs:
fail-fast: false
matrix:
params: [
{containerd_version: active, vmm: qemu},
{containerd_version: latest, vmm: qemu},
]
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-cri-ppc64le-${{ toJSON(matrix) }}

20
.github/workflows/run-k8s-tests-on-free-runner.yaml vendored
View File

@@ -40,16 +40,16 @@ jobs:
fail-fast: false
matrix:
environment: [
{ vmm: clh, containerd_version: lts },
{ vmm: clh, containerd_version: active },
{ vmm: dragonball, containerd_version: lts },
{ vmm: dragonball, containerd_version: active },
{ vmm: qemu, containerd_version: lts },
{ vmm: qemu, containerd_version: active },
{ vmm: qemu-runtime-rs, containerd_version: lts },
{ vmm: qemu-runtime-rs, containerd_version: active },
{ vmm: clh-runtime-rs, containerd_version: lts },
{ vmm: clh-runtime-rs, containerd_version: active },
{ vmm: clh, containerd_version: latest },
{ vmm: clh, containerd_version: minimum },
{ vmm: dragonball, containerd_version: latest },
{ vmm: dragonball, containerd_version: minimum },
{ vmm: qemu, containerd_version: latest },
{ vmm: qemu, containerd_version: minimum },
{ vmm: qemu-runtime-rs, containerd_version: latest },
{ vmm: qemu-runtime-rs, containerd_version: minimum },
{ vmm: clh-runtime-rs, containerd_version: latest },
{ vmm: clh-runtime-rs, containerd_version: minimum },
]
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-free-runner-${{ toJSON(matrix) }}

2
.github/workflows/run-kata-coco-tests.yaml vendored
View File

@@ -190,7 +190,7 @@ jobs:
AUTO_GENERATE_POLICY: "yes"
K8S_TEST_HOST_TYPE: "all"
CONTAINER_ENGINE: "containerd"
CONTAINER_ENGINE_VERSION: "active"
CONTAINER_ENGINE_VERSION: "latest"
GH_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

2
.github/workflows/run-kata-monitor-tests.yaml vendored
View File

@@ -33,7 +33,7 @@ jobs:
# TODO: enable when https://github.com/kata-containers/kata-containers/issues/9853 is fixed
#include:
# - container_engine: containerd
# containerd_version: lts
# containerd_version: latest
exclude:
# TODO: enable with containerd when https://github.com/kata-containers/kata-containers/issues/9761 is fixed
- container_engine: containerd

4
tests/gha-run-k8s-common.sh
View File

@@ -528,9 +528,9 @@ function deploy_vanilla_k8s() {
[[ -z "${container_engine}" ]] && die "container_engine is required"
[[ -z "${container_engine_version}" ]] && die "container_engine_version is required"
# Resolve lts/active to the actual version from versions.yaml (e.g. v1.7, v2.1)
# Resolve minimum/latest to the actual version from versions.yaml (e.g. v1.7, v2.3)
case "${container_engine_version}" in
lts|active)
minimum|latest)
container_engine_version=$(get_from_kata_deps ".externals.containerd.${container_engine_version}")
;;
*) ;;

6
versions.yaml
View File

@@ -312,10 +312,8 @@ externals:
# containerd from v1.5.0 used the path unix socket
# instead of abstract socket, thus kata wouldn's support the containerd's
# version older than them.
version: "v1.7.25"
lts: "v1.7"
active: "v2.2"
sandbox_api: "v2.3"
minimum: "v1.7"
latest: "v2.3"
critools:
description: "CLI tool for Container Runtime Interface (CRI)"