Merge pull request #7322 from fidencio/topic/gha-ci-add-cri-containerd-tests-skeleton-follow-up

gha: ci: Add cri-containerd tests skeleton -- follow up 1
This commit is contained in:
Fabiano Fidêncio 2023-07-13 13:53:48 +02:00 committed by GitHub
commit eed3c7c046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions

View File

@ -14,15 +14,21 @@ jobs:
strategy: strategy:
fail-fast: true fail-fast: true
matrix: matrix:
containerd_version: ['lts', 'active']
vmm: ['clh', 'qemu'] vmm: ['clh', 'qemu']
runs-on: garm-ubuntu-2204 runs-on: garm-ubuntu-2204
env: env:
CONTAINERD_VERSION: ${{ matrix.containerd_version }}
GOPATH: ${{ github.workspace }}
KATA_HYPERVSIOR: ${{ matrix.vmm }} KATA_HYPERVSIOR: ${{ matrix.vmm }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
ref: ${{ inputs.commit-hash }} ref: ${{ inputs.commit-hash }}
- name: Install dependencies
run: bash tests/integration/cri-containerd/gha-run.sh install-dependencies
- name: get-kata-tarball - name: get-kata-tarball
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:

View File

@ -13,6 +13,10 @@ kata_tarball_dir="${2:-kata-artifacts}"
cri_containerd_dir="$(dirname "$(readlink -f "$0")")" cri_containerd_dir="$(dirname "$(readlink -f "$0")")"
source "${cri_containerd_dir}/../../common.bash" source "${cri_containerd_dir}/../../common.bash"
function install_dependencies() {
return 0
}
function run() { function run() {
info "Running cri-containerd tests using ${KATA_HYPERVISOR} hypervisor" info "Running cri-containerd tests using ${KATA_HYPERVISOR} hypervisor"
@ -23,6 +27,7 @@ function run() {
function main() { function main() {
action="${1:-}" action="${1:-}"
case "${action}" in case "${action}" in
install-dependencies) install_dependencies ;;
install-kata) install_kata ;; install-kata) install_kata ;;
run) run ;; run) run ;;
*) >&2 die "Invalid argument" ;; *) >&2 die "Invalid argument" ;;

View File

@ -228,6 +228,8 @@ externals:
# 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.6.8"
lts: "v1.6"
active: "v1.7"
critools: critools:
description: "CLI tool for Container Runtime Interface (CRI)" description: "CLI tool for Container Runtime Interface (CRI)"