From ae8a54dfe6436cbaa6c7399762cade026389e3d7 Mon Sep 17 00:00:00 2001
From: Shreyas Rao <42259948+shreyas-s-rao@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:55:30 -0700
Subject: [PATCH] Update ubuntu image for e2e test infra job; add ginkgo
 prerequisite for `make test-e2e` (#933)

---
 Makefile                                   | 2 +-
 hack/e2e-test/infrastructure/base/job.yaml | 2 +-
 test/e2e/utils.go                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0bc1697d6..7ba1401bb 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ test-cov-clean:
 	@$(HACK_DIR)/test-cover-clean.sh
 
 .PHONY: test-e2e
-test-e2e: $(KUBECTL) $(HELM) $(SKAFFOLD) $(KUSTOMIZE)
+test-e2e: $(KUBECTL) $(HELM) $(SKAFFOLD) $(KUSTOMIZE) $(GINKGO)
 	@VERSION=$(VERSION) GIT_SHA=$(GIT_SHA) $(HACK_DIR)/e2e-test/run-e2e-test.sh $(PROVIDERS)
 
 .PHONY: ci-e2e-kind
diff --git a/hack/e2e-test/infrastructure/base/job.yaml b/hack/e2e-test/infrastructure/base/job.yaml
index 35eb06d5a..5e91c2738 100644
--- a/hack/e2e-test/infrastructure/base/job.yaml
+++ b/hack/e2e-test/infrastructure/base/job.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: infra
-        image: ubuntu:23.10
+        image: ubuntu:24.04
         command: ["/bin/bash"]
         args: ["-c", "/var/lib/infra/data/run/run.sh"]
         volumeMounts:
diff --git a/test/e2e/utils.go b/test/e2e/utils.go
index 82cb03870..f24aafb02 100644
--- a/test/e2e/utils.go
+++ b/test/e2e/utils.go
@@ -638,7 +638,7 @@ func getPurgeLocalSnapstoreJob(storeContainer, storePrefix string) *batchv1.Job
 			Containers: []corev1.Container{
 				{
 					Name:    "infra",
-					Image:   "ubuntu:23.10",
+					Image:   "ubuntu:24.04",
 					Command: []string{"/bin/bash"},
 					Args: []string{"-c",
 						fmt.Sprintf("rm -rf /host-dir-etc/gardener/local-backupbuckets/%s/%s/*", storeContainer, storePrefix),