github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 08:56:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2452 from GabyCT/topic/skipvirtcontainers

Browse Source 
ci: Do not setup virtcontainers while using podman
This commit is contained in:
GabyCT
2020-02-11 16:14:56 -06:00
committed by GitHub
parent 4d443056bf 83561c4ce3
commit 645dfc81f6
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/go-test.sh
View File

@@ -7,5 +7,8 @@ set -e
cidir=$(dirname "$0") cidir=$(dirname "$0")
source "${cidir}/lib.sh" source "${cidir}/lib.sh"
export CI_JOB="${CI_JOB:-default}"
run_go_test if [ "${CI_JOB}" != "PODMAN" ]; then
run_go_test
fi

11
.ci/setup.sh
View File

@@ -8,6 +8,7 @@ set -e
cidir=$(dirname "$0") cidir=$(dirname "$0")
source "${cidir}/lib.sh" source "${cidir}/lib.sh"
export CI_JOB="${CI_JOB:-default}"
clone_tests_repo clone_tests_repo
@@ -15,8 +16,10 @@ pushd "${tests_repo_dir}"
.ci/setup.sh .ci/setup.sh
popd popd
echo "Setup virtcontainers environment" if [ "${CI_JOB}" != "PODMAN" ]; then
chronic sudo -E PATH=$PATH bash -c "${cidir}/../virtcontainers/utils/virtcontainers-setup.sh" echo "Setup virtcontainers environment"
chronic sudo -E PATH=$PATH bash -c "${cidir}/../virtcontainers/utils/virtcontainers-setup.sh"
echo "Install virtcontainers" echo "Install virtcontainers"
make -C "${cidir}/../virtcontainers" && chronic sudo make -C "${cidir}/../virtcontainers" install make -C "${cidir}/../virtcontainers" && chronic sudo make -C "${cidir}/../virtcontainers" install
fi