diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index f88842e694..e54289287f 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -279,50 +279,6 @@ jobs: timeout-minutes: 15 run: bash tests/functional/vfio/gha-run.sh run - run-docker-tests: - name: run-docker-tests - strategy: - # We can set this to true whenever we're 100% sure that - # all the tests are not flaky, otherwise we'll fail them - # all due to a single flaky instance. - fail-fast: false - matrix: - vmm: - - qemu - runs-on: ubuntu-22.04 - env: - KATA_HYPERVISOR: ${{ matrix.vmm }} - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ inputs.commit-hash }} - fetch-depth: 0 - persist-credentials: false - - - name: Rebase atop of the latest target branch - run: | - ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" - env: - TARGET_BRANCH: ${{ inputs.target-branch }} - - - name: Install dependencies - run: bash tests/integration/docker/gha-run.sh install-dependencies - env: - GH_TOKEN: ${{ github.token }} - - - name: get-kata-tarball - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - with: - name: kata-static-tarball-amd64${{ inputs.tarball-suffix }} - path: kata-artifacts - - - name: Install kata - run: bash tests/integration/docker/gha-run.sh install-kata kata-artifacts - - - name: Run docker smoke test - timeout-minutes: 5 - run: bash tests/integration/docker/gha-run.sh run - run-nerdctl-tests: name: run-nerdctl-tests strategy: diff --git a/.github/workflows/basic-ci-s390x.yaml b/.github/workflows/basic-ci-s390x.yaml index 41aafe0e44..cab3d4724e 100644 --- a/.github/workflows/basic-ci-s390x.yaml +++ b/.github/workflows/basic-ci-s390x.yaml @@ -106,44 +106,3 @@ jobs: - name: Run containerd-stability tests timeout-minutes: 15 run: bash tests/stability/gha-run.sh run - - run-docker-tests: - name: run-docker-tests - strategy: - # We can set this to true whenever we're 100% sure that - # all the tests are not flaky, otherwise we'll fail them - # all due to a single flaky instance. - fail-fast: false - matrix: - vmm: ['qemu'] - runs-on: s390x-large - env: - KATA_HYPERVISOR: ${{ matrix.vmm }} - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ inputs.commit-hash }} - fetch-depth: 0 - persist-credentials: false - - - name: Rebase atop of the latest target branch - run: | - ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" - env: - TARGET_BRANCH: ${{ inputs.target-branch }} - - - name: Install dependencies - run: bash tests/integration/docker/gha-run.sh install-dependencies - - - name: get-kata-tarball - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - with: - name: kata-static-tarball-s390x${{ inputs.tarball-suffix }} - path: kata-artifacts - - - name: Install kata - run: bash tests/integration/docker/gha-run.sh install-kata kata-artifacts - - - name: Run docker smoke test - timeout-minutes: 5 - run: bash tests/integration/docker/gha-run.sh run diff --git a/tests/integration/docker/gha-run.sh b/tests/integration/docker/gha-run.sh deleted file mode 100755 index 6860cd108a..0000000000 --- a/tests/integration/docker/gha-run.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2023 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 -# - -set -o errexit -set -o nounset -set -o pipefail - -kata_tarball_dir="${2:-kata-artifacts}" -docker_dir="$(dirname "$(readlink -f "$0")")" -source "${docker_dir}/../../common.bash" -image="${image:-instrumentisto/nmap:latest}" - -function install_dependencies() { - info "Installing the dependencies needed for running the docker smoke test" - - sudo -E docker pull "${image}" -} - -function run() { - info "Running docker smoke test tests using ${KATA_HYPERVISOR} hypervisor" - - enabling_hypervisor - - info "Running docker with runc" - sudo docker run --rm --entrypoint nping "${image}" --tcp-connect -c 2 -p 80 www.github.com - - info "Running docker with Kata Containers (${KATA_HYPERVISOR})" - sudo docker run --rm --runtime io.containerd.kata-${KATA_HYPERVISOR}.v2 --entrypoint nping "${image}" --tcp-connect -c 2 -p 80 www.github.com -} - -function main() { - action="${1:-}" - case "${action}" in - install-dependencies) install_dependencies ;; - install-kata) install_kata ;; - run) run ;; - *) >&2 die "Invalid argument" ;; - esac -} - -main "$@"