From 3ede2538cef701188815cbf1c38fd5868a6962f0 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Tue, 5 Dec 2023 15:29:27 +0000 Subject: [PATCH] ci: Try to install devbox in prow job --- scripts/ci-e2e.sh | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index 549e46e055..b492cb53ba 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -8,24 +8,11 @@ set -o pipefail REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. cd "${REPO_ROOT}" || exit 1 -# Expects ubuntu container - -# Install prerequisites -apt update -apt install -y make wget - -make --version -docker --version - -# shellcheck source=./hack/install-go.sh -source "${REPO_ROOT}/hack/install-go.sh" - -# shellcheck source=./hack/ensure-go.sh -source "${REPO_ROOT}/hack/ensure-go.sh" - -# Make sure the tools binaries are on the path. -export PATH="${REPO_ROOT}/hack/tools/bin:${PATH}" +# Install devbox +curl -fsSL https://get.jetpack.io/devbox | bash +# Install tools +devbox install # Override e2e conf values with CI specific environment variables MAKE_TARGET=${MAKE_TARGET} @@ -43,4 +30,4 @@ NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME=${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME} NUTANIX_SUBNET_NAME=${NUTANIX_SUBNET_NAME} # Run e2e tests -make ${MAKE_TARGET} LABEL_FILTERS=${LABEL_FILTERS} \ No newline at end of file +devbox run -- make ${MAKE_TARGET} LABEL_FILTERS=${LABEL_FILTERS} \ No newline at end of file