Skip to content

Commit

Permalink
workflows/docker: switch to CRI-O
Browse files Browse the repository at this point in the history
The e2e tests for docker on Kind and Containerd has failed due the bug
of nydus-snapshotter, the well-known problem of image layers not being
found at host. That issues doesn't affect CRI-O, so let's switch to that
container runtime for running the tests on.
  • Loading branch information
wainersm authored and stevenhorsman committed Jan 22, 2025
1 parent 968e442 commit 25e3bee
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/e2e_docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ on:
description: Git ref to checkout the cloud-api-adaptor repository. Defaults to main.
required: false
type: string
container_runtime:
default: 'containerd'
description: Name of the container runtime. Either containerd or crio.
required: false
type: string

env:
CLOUD_PROVIDER: docker
Expand Down Expand Up @@ -100,6 +105,7 @@ jobs:
DOCKER_PODVM_IMAGE="${{ inputs.podvm_image }}"
DOCKER_HOST="unix:///var/run/docker.sock"
DOCKER_NETWORK_NAME="kind"
CONTAINER_RUNTIME="${{ inputs.container_runtime }}"
EOF
# For debugging
cat docker.properties
Expand All @@ -108,6 +114,7 @@ jobs:
id: runTests
run: |
export CLOUD_PROVIDER=docker
export CONTAINER_RUNTIME="${{ inputs.container_runtime }}"
export DEPLOY_KBS=false
export TEST_PROVISION=yes
export TEST_TEARDOWN=no
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/e2e_run_all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ jobs:
strategy:
fail-fast: false
matrix:
container_runtime:
- crio
os:
- fedora
provider:
Expand All @@ -305,6 +307,7 @@ jobs:
uses: ./.github/workflows/e2e_docker.yaml
with:
caa_image: ${{ inputs.registry }}/cloud-api-adaptor:${{ inputs.caa_image_tag }}-amd64-dev
container_runtime: ${{ matrix.container_runtime }}
podvm_image: ${{ needs.podvm_mkosi_amd64.outputs.docker_oci_image }}
install_directory_artifact: install_directory
git_ref: ${{ inputs.git_ref }}
Expand Down

0 comments on commit 25e3bee

Please sign in to comment.