try fixing missing network UUID env var

Author: mweibel

test/e2e/config/cloudscale.yaml

@@ -38,7 +38,7 @@ providers:
         files:
           - sourcePath: "../data/shared/v1beta2/metadata.yaml"
 
-  - name: cloudscale
+  - name: cloudscale-ch-cloudscale
     type: InfrastructureProvider
     versions:
       - name: v0.99.99 # dev version, always higher than any release

test/e2e/e2e_suite_test.go

@@ -161,6 +161,11 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	})
 	Expect(e2eConfig).NotTo(BeNil())
 
+	// Re-inject env-only variables lost when LoadE2EConfig overwrites e2eConfig.
+	if networkUUID := os.Getenv("CLOUDSCALE_NETWORK_UUID"); networkUUID != "" {
+		e2eConfig.Variables["CLOUDSCALE_NETWORK_UUID"] = networkUUID
+	}
+
 	if artifactFolder == "" {
 		artifactFolder = filepath.Join(os.TempDir(), "capcs-e2e-artifacts")
 	}

test/e2e/e2e_test.go

@@ -39,7 +39,7 @@ var _ = Describe("Workload cluster lifecycle", Label("lifecycle"), func() {
 				BootstrapClusterProxy:    bootstrapClusterProxy,
 				ArtifactFolder:           artifactFolder,
 				SkipCleanup:              skipCleanup,
-				InfrastructureProvider:   ptr.To("cloudscale"),
+				InfrastructureProvider:   ptr.To("cloudscale-ch-cloudscale"),
 				Flavor:                   ptr.To(""),
 				ControlPlaneMachineCount: ptr.To[int64](1),
 				WorkerMachineCount:       ptr.To[int64](1),
@@ -56,7 +56,7 @@ var _ = Describe("Workload cluster lifecycle", Label("lifecycle"), func() {
 				BootstrapClusterProxy:    bootstrapClusterProxy,
 				ArtifactFolder:           artifactFolder,
 				SkipCleanup:              skipCleanup,
-				InfrastructureProvider:   ptr.To("cloudscale"),
+				InfrastructureProvider:   ptr.To("cloudscale-ch-cloudscale"),
 				Flavor:                   ptr.To("ha"),
 				ControlPlaneMachineCount: ptr.To[int64](3),
 				WorkerMachineCount:       ptr.To[int64](2),
@@ -86,7 +86,7 @@ var _ = Describe("BYO networking", Label("byo-networking"), func() {
 				BootstrapClusterProxy:    bootstrapClusterProxy,
 				ArtifactFolder:           artifactFolder,
 				SkipCleanup:              skipCleanup,
-				InfrastructureProvider:   ptr.To("cloudscale"),
+				InfrastructureProvider:   ptr.To("cloudscale-ch-cloudscale"),
 				Flavor:                   ptr.To("byo-network"),
 				ControlPlaneMachineCount: ptr.To[int64](1),
 				WorkerMachineCount:       ptr.To[int64](1),
@@ -104,7 +104,7 @@ var _ = Describe("BYO networking", Label("byo-networking"), func() {
 				BootstrapClusterProxy:    bootstrapClusterProxy,
 				ArtifactFolder:           artifactFolder,
 				SkipCleanup:              skipCleanup,
-				InfrastructureProvider:   ptr.To("cloudscale"),
+				InfrastructureProvider:   ptr.To("cloudscale-ch-cloudscale"),
 				Flavor:                   ptr.To("public-lb-private-nodes"),
 				ControlPlaneMachineCount: ptr.To[int64](1),
 				WorkerMachineCount:       ptr.To[int64](1),
@@ -123,7 +123,7 @@ var _ = Describe("BYO networking", Label("byo-networking"), func() {
 				BootstrapClusterProxy:    bootstrapClusterProxy,
 				ArtifactFolder:           artifactFolder,
 				SkipCleanup:              skipCleanup,
-				InfrastructureProvider:   ptr.To("cloudscale"),
+				InfrastructureProvider:   ptr.To("cloudscale-ch-cloudscale"),
 				Flavor:                   ptr.To("private"),
 				ControlPlaneMachineCount: ptr.To[int64](1),
 				WorkerMachineCount:       ptr.To[int64](1),
@@ -142,7 +142,7 @@ var _ = Describe("BYO networking", Label("byo-networking"), func() {
 				BootstrapClusterProxy:    bootstrapClusterProxy,
 				ArtifactFolder:           artifactFolder,
 				SkipCleanup:              skipCleanup,
-				InfrastructureProvider:   ptr.To("cloudscale"),
+				InfrastructureProvider:   ptr.To("cloudscale-ch-cloudscale"),
 				Flavor:                   ptr.To("fip"),
 				ControlPlaneMachineCount: ptr.To[int64](1),
 				WorkerMachineCount:       ptr.To[int64](1),