From a1476e3526a49c4d357630b9b6b72f63e2b01e80 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Mon, 3 Feb 2025 11:03:18 -0800 Subject: [PATCH] Fix e2e pipeline due to vagrant cloud infra issues (#11706) Signed-off-by: Derek Nola --- Dockerfile.test | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index 3684398c5ece..ff24f7c7515c 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -36,15 +36,23 @@ ENTRYPOINT ["./scripts/entry.sh"] CMD ["test"] -FROM vagrantlibvirt/vagrant-libvirt:0.12.1 AS test-e2e -RUN apt-get update && apt-get install -y docker.io +FROM vagrantlibvirt/vagrant-libvirt:sha-a94ce0d AS test-e2e +RUN apt-get update && apt-get install -y docker.io wget + ENV VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 RUN vagrant plugin install vagrant-k3s vagrant-reload vagrant-scp -RUN vagrant box add bento/ubuntu-24.04 --provider libvirt --force + +# Workaround for older vagrant-libvirt image and new vagrant infra wesbites +# See https://github.com/hashicorp/vagrant/issues/13571 and +# https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1840 +RUN wget https://app.vagrantup.com/bento/boxes/ubuntu-24.04/versions/202404.26.0/providers/libvirt.box -O bento-ubuntu24.04-202404.26.0.box +RUN vagrant box add bento/ubuntu-24.04 bento-ubuntu24.04-202404.26.0.box +RUN cd /.vagrant.d/boxes/bento-VAGRANTSLASH-ubuntu-24.04/ && mv 0 202404.26.0 && echo -n "https://app.vagrantup.com/bento/boxes/ubuntu-24.04" > metadata_url + RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"; \ chmod +x ./kubectl; \ mv ./kubectl /usr/local/bin/kubectl -RUN GO_VERSION=go1.21.5; \ +RUN GO_VERSION=go1.22.5; \ curl -O -L "https://golang.org/dl/${GO_VERSION}.linux-amd64.tar.gz"; \ rm -rf /usr/local/go; \ tar -C /usr/local -xzf ${GO_VERSION}.linux-amd64.tar.gz;