From 961daee9835ec5a013a9c8aa4be9adc973fd529d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 11 Oct 2023 11:48:22 +0200 Subject: [PATCH] scripts: Use install_yq from the `kata-containers` repo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the file is already part of the kata-containers repo, and the tests repo is about to become read-only, we're good to drop the tests references from here and use everything coming from the `kata-containers` repo instead. Signed-off-by: Fabiano Fidêncio (cherry picked from commit fbc8f8f466e1b8b38d59223cbc6461cabb85b181) Signed-off-by: Greg Kurz --- tools/packaging/scripts/lib.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tools/packaging/scripts/lib.sh b/tools/packaging/scripts/lib.sh index d1e17e20d7..0bd873721f 100644 --- a/tools/packaging/scripts/lib.sh +++ b/tools/packaging/scripts/lib.sh @@ -6,8 +6,6 @@ # export GOPATH=${GOPATH:-${HOME}/go} -export tests_repo="${tests_repo:-github.com/kata-containers/tests}" -export tests_repo_dir="$GOPATH/src/$tests_repo" export BUILDER_REGISTRY="${BUILDER_REGISTRY:-quay.io/kata-containers/builders}" export PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-"no"}" @@ -29,19 +27,8 @@ ARCH=${ARCH:-$(uname -m)} TARGET_OS=${TARGET_OS:-linux} [ "${CROSS_BUILD}" == "true" ] && BUILDX=buildx && PLATFORM="--platform=${TARGET_OS}/${TARGET_ARCH}" -clone_tests_repo() { - # KATA_CI_NO_NETWORK is (has to be) ignored if there is - # no existing clone. - if [ -d "${tests_repo_dir}" ] && [ -n "${KATA_CI_NO_NETWORK:-}" ]; then - return - fi - - go get -d -u "$tests_repo" || true -} - install_yq() { - clone_tests_repo - pushd "$tests_repo_dir" + pushd "${repo_root_dir}" .ci/install_yq.sh popd }