containerd e2e: use curl instead of wget, rename script

to better reflect usage, we aren't only using this script in CI, unlike the shellcheck script
This commit is contained in:
Benjamin Elder 2023-04-17 17:33:46 -07:00
parent c621c1de44
commit 13ace9f76b
2 changed files with 3 additions and 3 deletions

View File

@ -43,7 +43,7 @@ func testE2EContainerdPull(t *testing.T, containerdVersion string) {
// install containerd and image puller tool
installDir := filepath.Join(binDir, "containerd-"+containerdVersion)
// nolint:gosec
installCmd := exec.Command(filepath.Join(repoRoot, "hack", "tools", "ci-install-containerd.sh"))
installCmd := exec.Command(filepath.Join(repoRoot, "hack", "tools", "e2e-setup-containerd.sh"))
installCmd.Env = append(installCmd.Env,
"CONTAINERD_VERSION="+containerdVersion,
"CONTAINERD_INSTALL_DIR="+installDir,
@ -65,7 +65,7 @@ func testE2EContainerdPull(t *testing.T, containerdVersion string) {
// nolint:gosec
containerdCmd := exec.Command(
filepath.Join(installDir, "containerd"),
// config generated by ci-install-containerd.sh
// config generated by e2e-setup-containerd.sh
"--config="+filepath.Join(installDir, "containerd-config.toml"),
"--root="+filepath.Join(tmpDir, "root"),
"--state="+filepath.Join(tmpDir, "state"),

View File

@ -30,7 +30,7 @@ if [[ -f "${containerd_path}" ]] && "${containerd_path}" --version | grep -q "${
else
# downlod containerd to bindir
mkdir -p "${CONTAINERD_INSTALL_DIR}"
wget -qO- \
curl -sSL \
"https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/containerd-${CONTAINERD_VERSION}-linux-amd64.tar.gz" \
| tar -C "${CONTAINERD_INSTALL_DIR}/" -zxvf - --strip-components=1
fi