diff --git a/.github/workflows/e2e_docker.yaml b/.github/workflows/e2e_docker.yaml index 21670c65b..69d850a71 100644 --- a/.github/workflows/e2e_docker.yaml +++ b/.github/workflows/e2e_docker.yaml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/e2e_run_all.yaml b/.github/workflows/e2e_run_all.yaml index 93bbed265..fd06a0a73 100644 --- a/.github/workflows/e2e_run_all.yaml +++ b/.github/workflows/e2e_run_all.yaml @@ -296,6 +296,8 @@ jobs: strategy: fail-fast: false matrix: + container_runtime: + - crio os: - fedora provider: @@ -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 }}