diff --git a/.ci/go-test.sh b/.ci/go-test.sh index 47db5b8c1..36fcd9ce4 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 ff0ab8c9b..9c0526754 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