github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-01-29 21:39:23 +00:00
Code Issues Projects Releases Wiki Activity

ci: Fix kernel config version check.

Browse Source 
Make sure kernel config version is validated on test.

Also, increse Kata Kernel config version.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2018-07-11 18:30:45 -05:00
parent 03fc1e3e9d
commit 7b5d62fb74
4 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.ci/lib.sh
View File

@@ -11,20 +11,6 @@ die(){
exit 1
}
# Check that kata_confing_version file is updated
# when there is any change in the kernel directory.
# If there is a change in the directory, but the config
# version is not updated, return error.
check_kata_kernel_version(){
kernel_version_file="kernel/kata_config_version"
modified_files=$(git diff --name-only master..)
if echo "$modified_files" | grep "kernel/"; then
echo "$modified_files" | grep "$kernel_version_file" || \
die "Please bump version in $kernel_version_file"
fi
}
install_yq() {
GOPATH=${GOPATH:-${HOME}/go}
local yq_path="${GOPATH}/bin/yq"

3
.ci/run.sh
View File

@@ -14,9 +14,6 @@ source "${cidir}/lib.sh"
source /etc/os-release
# This script will execute packaging tests suite
# TODO: Add steps needed to build packages
check_kata_kernel_version
if [ "$ID" == ubuntu ];then
echo "Building snap image"

43
.ci/test.sh
View File

@@ -9,7 +9,7 @@ set -o nounset
set -o pipefail
CI=${CI:-}
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly toplevel_mk="${script_dir}/../Makefile"
source "${script_dir}/lib.sh"
@@ -17,20 +17,47 @@ make_target() {
target=$1
dir=$2
if [ -n "${CI}" ] && [ "${target}" == "test-packaging-tools" ];then
echo "skip $target see https://github.com/kata-containers/packaging/issues/72"
return
fi
pushd "${script_dir}/.." >> /dev/null
if [ -n "${CI}" ] && ! git whatchanged origin/master..HEAD "${dir}" | grep "${dir}" >> /dev/null; then
pushd "${script_dir}/.." >>/dev/null
if [ -n "${CI}" ] && ! git whatchanged origin/master..HEAD "${dir}" | grep "${dir}" >>/dev/null; then
echo "Not changes in ${dir}"
return
fi
popd >> /dev/null
case "${target}" in
test-packaging-tools)
skip_msg="skip $target see https://github.com/kata-containers/packaging/issues/72"
[ -n "${CI}" ] && echo "${skip_msg}" && return
;;
test-build-kernel)
[ -n "${CI}" ] && check_kata_kernel_version
;;
esac
popd >>/dev/null
echo "Changes found in ${dir}"
make -f "${toplevel_mk}" "${target}"
}
# Check that kata_confing_version file is updated
# when there is any change in the kernel directory.
# If there is a change in the directory, but the config
# version is not updated, return error.
check_kata_kernel_version() {
kernel_version_file="kernel/kata_config_version"
modified_files=$(git diff --name-only origin/master..HEAD)
echo "Check Changes in kernel"
git diff origin/master..HEAD ${kernel_version_file}
git diff --name-only origin/master..HEAD
if git whatchanged origin/master..HEAD "kernel/" | grep "kernel/" >>/dev/null; then
echo "Kernel directory has changes check $kernel_version_file changed"
echo "$modified_files" | grep "$kernel_version_file" ||
die "Please bump version in $kernel_version_file"
fi
echo "OK - config version file was updated"
}
make_target test-release-tools "release/"
make_target test-packaging-tools "obs-packaging/"
make_target test-static-build "static-build/"

2
kernel/kata_config_version
View File

@@ -1 +1 @@
1
2