From 5ff530371e7439f8d8fd42c1811c97bd1d0a189b Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 3 Jul 2020 15:50:02 +0000 Subject: [PATCH] tools: fix branch and runime repo Kata 2.0 lives in `github.com/kata-containers/kata-containers`, so all scripts should point to it. Currently the branch for Kata 2.0 is 2.0-dev not master, then the branch envar must be used instead of hardcoding `master` as default branch. Signed-off-by: Julio Montes --- tools/packaging/scripts/lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/scripts/lib.sh b/tools/packaging/scripts/lib.sh index 847de76f3..f809defac 100644 --- a/tools/packaging/scripts/lib.sh +++ b/tools/packaging/scripts/lib.sh @@ -30,9 +30,9 @@ install_yq() { get_from_kata_deps() { local dependency="$1" - BRANCH=${BRANCH:-master} + BRANCH=${branch:-master} local branch="${2:-${BRANCH}}" - local runtime_repo="github.com/kata-containers/runtime" + local runtime_repo="github.com/kata-containers/kata-containers" GOPATH=${GOPATH:-${HOME}/go} local runtime_repo_dir="${GOPATH}/src/${runtime_repo}" # For our CI, we will query the local versions.yaml file both for kernel and