From a09e58fa80ae81c0d336d9a782da4f38f9492da1 Mon Sep 17 00:00:00 2001 From: Carlos Venegas Date: Fri, 19 Mar 2021 15:50:41 +0000 Subject: [PATCH] packaging: Use local file for assets. When kata used multiple repositories, versions file was downloaded. This is not needed anymore as the file is part of the same repository. Signed-off-by: Carlos Venegas --- tools/packaging/scripts/lib.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/tools/packaging/scripts/lib.sh b/tools/packaging/scripts/lib.sh index 649b53a3ea..590ebe095e 100644 --- a/tools/packaging/scripts/lib.sh +++ b/tools/packaging/scripts/lib.sh @@ -34,26 +34,12 @@ install_yq() { get_from_kata_deps() { local dependency="$1" - BRANCH=${branch:-master} - local branch="${2:-${BRANCH}}" GOPATH=${GOPATH:-${HOME}/go} - # For our CI, we will query the local versions.yaml file both for kernel and - # all other subsystems. eg: a new version of NEMU would be good to test - # through CI. For the kernel, .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. - if [ "${CI:-}" = "true" ]; then - versions_file="${this_script_dir}/../../../versions.yaml" - else - versions_file="versions-${branch}.yaml" - fi + versions_file="${this_script_dir}/../../../versions.yaml" #make sure yq is installed install_yq >&2 - if [ ! -e "${versions_file}" ]; then - cp "${this_script_dir}/../../../versions.yaml" ${versions_file} - fi result=$("${GOPATH}/bin/yq" read -X "$versions_file" "$dependency") [ "$result" = "null" ] && result="" echo "$result"