E2E: Use bucket for flatcar production image

There seems to be an issue with downloading the image straight from upstream.

This adds GlanceName to the DownloadImage struct to allow overriding the
inferred Glance image name, since the bucket filename includes a version
number but we want the Glance image to keep the original name.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

Author: lentzi90

test/e2e/shared/images.go

@@ -60,6 +60,8 @@ type DownloadImage struct {
 	ArtifactPath string
 	// A hash used to verify the downloaded image
 	Hash, HashAlgorithm string
+	// GlanceName overrides the inferred Glance image name if set
+	GlanceName string
 }
 
 func CoreImages(e2eCtx *E2EContext) []DownloadImage {
@@ -128,13 +130,16 @@ func ApplyGlanceImages(ctx context.Context, e2eCtx *E2EContext, images []Downloa
 		Expect(err).NotTo(HaveOccurred(), "parsing "+url)
 		d := strings.Split(u.Path, "/")
 		Expect(len(d)).To(BeNumerically(">", 1), "Not enough path elements in "+url)
-		glanceName := d[len(d)-1]
-
-		// Remove the type suffix
-		for _, suffix := range []string{".img", ".qcow2"} {
-			if strings.HasSuffix(glanceName, suffix) {
-				glanceName = glanceName[:len(glanceName)-len(suffix)]
-				continue
+		glanceName := image.GlanceName
+		if glanceName == "" {
+			glanceName = d[len(d)-1]
+
+			// Remove the type suffix
+			for _, suffix := range []string{".img", ".qcow2"} {
+				if strings.HasSuffix(glanceName, suffix) {
+					glanceName = glanceName[:len(glanceName)-len(suffix)]
+					continue
+				}
 			}
 		}
 

test/e2e/suites/e2e/e2e_test.go

@@ -71,8 +71,9 @@ func flatcarImages(e2eCtx *shared.E2EContext) []shared.DownloadImage {
 			ArtifactPath: "flatcar/" + e2eCtx.E2EConfig.GetVariable("OPENSTACK_FLATCAR_IMAGE_NAME") + ".img",
 		},
 		{
-			Name: "flatcar-openstack",
-			URL:  "https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img",
+			Name:       "flatcar-openstack",
+			URL:        "https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar_production_openstack_image-4459.2.2.img",
+			GlanceName: "flatcar_production_openstack_image",
 		},
 	}
 }