From b4de168cf4e3b0857e3ae14991e8852e2785fefd Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 11 Mar 2019 11:46:17 -0600 Subject: [PATCH 1/2] tests: skip euleros euleros mirrors are down almost all time, don't fail if euleros rootfs or image can't be generated. fixes #238 Signed-off-by: James O. D. Hunt Signed-off-by: Julio Montes --- tests/test_config.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/test_config.sh b/tests/test_config.sh index 4e762744..357938d2 100644 --- a/tests/test_config.sh +++ b/tests/test_config.sh @@ -6,9 +6,8 @@ # List of distros not to test, when running all tests with test_images.sh typeset -a skipWhenTestingAll -if [ -n "${TRAVIS:-}" ]; then - # (travis may timeout with euleros, see: - # https://github.com/kata-containers/osbuilder/issues/46)" +if [ -n "${CI:-}" ]; then + # CI tests may timeout with euleros, see: + # https://github.com/kata-containers/osbuilder/issues/46" skipWhenTestingAll+=(euleros) fi - From 519bbe8f6639a1290975835ae475602ab3244d3f Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 11 Mar 2019 15:14:44 -0600 Subject: [PATCH 2/2] tests: remove docker before installing the newer version In some distros docker is already installed and the CI fails because the newer version can't be installed because it conflicts with the old version. Remove old version before installing the newer version of docker. fixes #241 Signed-off-by: Julio Montes --- tests/test_images.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_images.sh b/tests/test_images.sh index ceef790a..3971ca8a 100755 --- a/tests/test_images.sh +++ b/tests/test_images.sh @@ -251,6 +251,7 @@ setup() [ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}" if [ -z "${KATA_DEV_MODE:-}" ]; then + chronic $mgr remove-docker chronic $mgr install-docker-system else info "Running with KATA_DEV_MODE set, skipping installation of docker and kata packages"