github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

tools/osbuilder/tests: Remove TRAVIS variable

Browse Source 
The last remaining user of the TRAVIS variable in this repo is
tools/osbuilder/tests and it is only used to skip spinning up VMs. Travis
didn't support virtualization and the same is true for github actions hosted
runners. Replace the variable with KVM_MISSING and determine availability of
/dev/kvm at runtime.

TRAVIS is also used by '.ci/setup.sh' in kata-containers/tests to reduce the
set of dependencies that gets installed, but this is also in the process of
being removed.

Fixes: #3544
Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2023-03-03 11:19:38 +01:00
parent f31c79d210
commit 439ff9d4c4
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/static-checks.yaml vendored
View File

@ -19,7 +19,6 @@ jobs:
- "make test" - "make test"
- "sudo -E PATH=\"$PATH\" make test" - "sudo -E PATH=\"$PATH\" make test"
env: env:
TRAVIS: "true"
RUST_BACKTRACE: "1" RUST_BACKTRACE: "1"
target_branch: ${{ github.base_ref }} target_branch: ${{ github.base_ref }}
steps: steps:

15
tools/osbuilder/tests/test_images.sh
View File

@ -32,6 +32,7 @@ readonly KATA_HYPERVISOR="${KATA_HYPERVISOR:-}"
readonly KATA_DEV_MODE="${KATA_DEV_MODE:-}" readonly KATA_DEV_MODE="${KATA_DEV_MODE:-}"
readonly ci_results_dir="/var/osbuilder/tests" readonly ci_results_dir="/var/osbuilder/tests"
readonly dracut_dir=${project_dir}/dracut readonly dracut_dir=${project_dir}/dracut
readonly KVM_MISSING="$([ -e /dev/kvm ] || echo true)"
build_images=1 build_images=1
build_initrds=1 build_initrds=1
@ -166,7 +167,7 @@ exit_handler()
rm -rf "${tmp_dir}" rm -rf "${tmp_dir}"
# Restore the default image in config file # Restore the default image in config file
[ -n "${TRAVIS:-}" ] || run_mgr configure-image [ -n "${KVM_MISSING:-}" ] || run_mgr configure-image
return return
fi fi
@ -258,8 +259,7 @@ set_runtime()
[ -n "${KATA_DEV_MODE}" ] && return [ -n "${KATA_DEV_MODE}" ] && return
# Travis doesn't support VT-x [ -n "${KVM_MISSING:-}" ] && return
[ -n "${TRAVIS:-}" ] && return
if [ "$KATA_HYPERVISOR" != "firecracker" ]; then if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
if [ -f "$sysconfig_docker_config_file" ]; then if [ -f "$sysconfig_docker_config_file" ]; then
@ -285,8 +285,7 @@ setup()
sudo -E mkdir -p ${ci_results_dir} sudo -E mkdir -p ${ci_results_dir}
fi fi
# Travis doesn't support VT-x [ -n "${KVM_MISSING:-}" ] && return
[ -n "${TRAVIS:-}" ] && return
[ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}" [ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}"
@ -383,8 +382,7 @@ install_image_create_container()
[ -z "$file" ] && die "need file" [ -z "$file" ] && die "need file"
[ ! -e "$file" ] && die "file does not exist: $file" [ ! -e "$file" ] && die "file does not exist: $file"
# Travis doesn't support VT-x [ -n "${KVM_MISSING:-}" ] && return
[ -n "${TRAVIS:-}" ] && return
showKataRunFailure=1 showKataRunFailure=1
run_mgr reset-config run_mgr reset-config
@ -401,8 +399,7 @@ install_initrd_create_container()
[ -z "$file" ] && die "need file" [ -z "$file" ] && die "need file"
[ ! -e "$file" ] && die "file does not exist: $file" [ ! -e "$file" ] && die "file does not exist: $file"
# Travis doesn't support VT-x [ -n "${KVM_MISSING:-}" ] && return
[ -n "${TRAVIS:-}" ] && return
showKataRunFailure=1 showKataRunFailure=1
run_mgr reset-config run_mgr reset-config