From 83561c4ce38e89d35b42928a3f052cc92b00b460 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Tue, 11 Feb 2020 10:25:55 -0600 Subject: [PATCH] ci: Do not setup virtcontainers while using podman 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 --- .ci/go-test.sh | 5 ++++- .ci/setup.sh | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.ci/go-test.sh b/.ci/go-test.sh index 47db5b8c17..36fcd9ce47 100755 --- a/.ci/go-test.sh +++ b/.ci/go-test.sh @@ -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 diff --git a/.ci/setup.sh b/.ci/setup.sh index ff0ab8c9bb..9c05267545 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -8,6 +8,7 @@ set -e cidir=$(dirname "$0") source "${cidir}/lib.sh" +export CI_JOB="${CI_JOB:-default}" clone_tests_repo @@ -15,8 +16,10 @@ 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