From 6b8f0dffebed5821b7030c32f7bdc951ff2c6120 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 2 Jul 2019 14:49:53 +0200 Subject: [PATCH] ci: make crictl install faster and independent of CRI-O Fixes: #1777 Signed-off-by: Sascha Grunert --- .ci/install_crio.sh | 11 +++-------- versions.yaml | 3 +++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.ci/install_crio.sh b/.ci/install_crio.sh index 17c9a5d14e..bbf2ba45a6 100755 --- a/.ci/install_crio.sh +++ b/.ci/install_crio.sh @@ -64,14 +64,9 @@ then fi echo "Get CRI Tools" -critools_repo="${kubernetes_sigs_org}/cri-tools" -go get "$critools_repo" || true -pushd "${GOPATH}/src/${critools_repo}" -critools_version=$(grep "ENV CRICTL_COMMIT" "${GOPATH}/src/${crio_repo}/Dockerfile" | cut -d " " -f3) -git checkout "${critools_version}" -go install ./cmd/crictl -sudo install "${GOPATH}/bin/crictl" /usr/bin -popd +crictl_version=$(get_test_version "externals.critools.version") +wget -qO- https://github.com/kubernetes-sigs/cri-tools/releases/download/$crictl_version/crictl-$crictl_version-linux-"$(.ci/kata-arch.sh -g)".tar.gz \ + | tar xfz - -C /usr/bin echo "Installing CRI-O" make clean diff --git a/versions.yaml b/versions.yaml index 0181f8617c..680330d90b 100644 --- a/versions.yaml +++ b/versions.yaml @@ -58,3 +58,6 @@ externals: description: "GNU parallel tool" url: "https://ftp.gnu.org/gnu/parallel" version: "20190222" + + critools: + version: v1.14.0