From 3771b04d6f85dc2a35e51d90523e790475dbecf4 Mon Sep 17 00:00:00 2001 From: Ganesh Maharaj Mahalingam Date: Tue, 9 Apr 2019 10:49:48 -0700 Subject: [PATCH] kernel: Make sure local versions.yaml file from runtime get precedence Fixes: #431 Signed-off-by: Ganesh Maharaj Mahalingam --- scripts/lib.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/lib.sh b/scripts/lib.sh index ba4b615978..2f2e3ff618 100644 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -35,6 +35,11 @@ get_from_kata_deps() { local branch="${2:-master}" local runtime_repo="github.com/kata-containers/runtime" GOPATH=${GOPATH:-${HOME}/go} + # We will not query the local versions.yaml file here to allow releases to + # always get the version from the committed tree. For our CI, + # .ci/install_kata_kernel.sh file in tests repository will pass the kernel + # version as an override to this function to allow testing of kernels before + # they land in tree. versions_file="versions-${branch}.yaml" if [ ! -e "${versions_file}" ]; then yaml_url="https://raw.githubusercontent.com/kata-containers/runtime/${branch}/versions.yaml"