Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
ci: make crictl install faster and independent of CRI-O
Browse files Browse the repository at this point in the history
Fixes: #1777

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
  • Loading branch information
saschagrunert committed Jul 10, 2019
1 parent 66ecddf commit b761e59
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
16 changes: 7 additions & 9 deletions .ci/install_crio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,21 @@ then
else
crio_version=$(get_version "externals.crio.meta.openshift")
fi
crictl_version=$(get_version "externals.crio.meta.crictl")
crictl_tag_prefix=""
else
crio_version=$(get_version "externals.crio.version")
crictl_version=$(get_test_version "externals.critools.version")
crictl_tag_prefix="v"
fi

git fetch
git checkout "${crio_version}"
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
echo "Installing CRI Tools"
crictl_url=https://github.com/kubernetes-sigs/cri-tools/releases/download/v$crictl_version/crictl-$crictl_tag_prefix$crictl_version-linux-"$(${cidir}/kata-arch.sh -g)".tar.gz
wget -Ls "$crictl_url" | tar xfz - -C /usr/local/bin

echo "Installing CRI-O"
make clean
Expand Down
3 changes: 3 additions & 0 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,6 @@ externals:
description: "GNU parallel tool"
url: "https://ftp.gnu.org/gnu/parallel"
version: "20190222"

critools:
version: 1.14.0

0 comments on commit b761e59

Please sign in to comment.