github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-11 12:52:23 +00:00
Code Issues Projects Releases Wiki Activity

ci: use .ci/setup.sh from tests repo

Browse Source 
Use .ci/setup.sh from tests repo, to make sure spell check packages are
correctly installed for the OS under test.

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
This commit is contained in:
Marco Vedovati 2019-07-17 19:43:29 +02:00
parent 1e5746a4f2
commit a5a33436a6
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.ci/setup.sh
View File

@ -4,30 +4,17 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set -e set -e
cidir=$(dirname "$0") cidir=$(dirname "$0")
source "${cidir}/lib.sh" source "${cidir}/lib.sh"
#Note: If add clearlinux as supported CI use a stateless os-release file
source /etc/os-release
if [ "$ID" == fedora ];then
sudo -E dnf -y install automake yamllint coreutils moreutils bc make gcc
elif [ "$ID" == centos ];then
sudo -E yum -y install epel-release
sudo -E yum -y install automake yamllint coreutils moreutils bc
elif [ "$ID" == ubuntu ];then
sudo apt-get -qq update
sudo apt-get install -y -qq make automake qemu-utils python-pip coreutils moreutils bc
sudo pip install yamllint
else
echo "Linux distribution not supported"
fi
clone_tests_repo clone_tests_repo
pushd "${tests_repo_dir}"
.ci/setup.sh
popd
bash "${cidir}/static-checks.sh" bash "${cidir}/static-checks.sh"
# yq needed to correctly parse runtime/versions.yaml # yq needed to correctly parse runtime/versions.yaml
make -C ${tests_repo_dir} install-yq make -C ${tests_repo_dir} install-yq

1
tests/test_images.sh
View File

@ -275,7 +275,6 @@ setup()
[ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}" [ ! -d "${tests_repo_dir}" ] && git clone "https://${tests_repo}" "${tests_repo_dir}"
if [ -z "${KATA_DEV_MODE:-}" ]; then if [ -z "${KATA_DEV_MODE:-}" ]; then
"${tests_repo_dir}/.ci/setup.sh"
mkdir -p /etc/kata-containers/ mkdir -p /etc/kata-containers/
sudo cp -a /usr/share/defaults/kata-containers/configuration.toml /etc/kata-containers/configuration.toml sudo cp -a /usr/share/defaults/kata-containers/configuration.toml /etc/kata-containers/configuration.toml
else else