Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
ci: Do not setup virtcontainers while using podman
Browse files Browse the repository at this point in the history
Skip the setup and installation of virtcontainers as it is using docker,
when we try to setup podman CI.

Depends-on: github.com/kata-containers/tests#2299

Fixes #2451

Signed-off-by: Gabriela Cervantes <[email protected]>
  • Loading branch information
GabyCT committed Feb 11, 2020
1 parent 1fa10fe commit 83561c4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .ci/go-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ set -e

cidir=$(dirname "$0")
source "${cidir}/lib.sh"
export CI_JOB="${CI_JOB:-default}"

run_go_test
if [ "${CI_JOB}" != "PODMAN" ]; then
run_go_test
fi
11 changes: 7 additions & 4 deletions .ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ set -e

cidir=$(dirname "$0")
source "${cidir}/lib.sh"
export CI_JOB="${CI_JOB:-default}"

clone_tests_repo

pushd "${tests_repo_dir}"
.ci/setup.sh
popd

echo "Setup virtcontainers environment"
chronic sudo -E PATH=$PATH bash -c "${cidir}/../virtcontainers/utils/virtcontainers-setup.sh"
if [ "${CI_JOB}" != "PODMAN" ]; then
echo "Setup virtcontainers environment"
chronic sudo -E PATH=$PATH bash -c "${cidir}/../virtcontainers/utils/virtcontainers-setup.sh"

echo "Install virtcontainers"
make -C "${cidir}/../virtcontainers" && chronic sudo make -C "${cidir}/../virtcontainers" install
echo "Install virtcontainers"
make -C "${cidir}/../virtcontainers" && chronic sudo make -C "${cidir}/../virtcontainers" install
fi

0 comments on commit 83561c4

Please sign in to comment.