E2E: Use UEFI

lentzi90 · lentzi90 · commit c709b4ed9dac · 2025-11-13T06:57:45.000Z
Switch e2e tests to UEFI instead of Legacy.

Signed-off-by: Lennart Jern &lt;lennart.jern@est.tech&gt;
diff --git a/hack/e2e/net.xml b/hack/e2e/net.xml
@@ -7,9 +7,6 @@
   </forward>
   <bridge name='metal3'/>
   <ip address='192.168.222.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='192.168.222.3' end='192.168.222.99'/>
-      <bootp file='http://192.168.222.2:6180/boot.ipxe'/>
-    </dhcp>
+    <!--<tftp root="/tmp/tftpboot"/>-->
   </ip>
 </network>
diff --git a/test/e2e/automated_cleaning_test.go b/test/e2e/automated_cleaning_test.go
@@ -59,7 +59,7 @@ var _ = Describe("Automated cleaning", Label("required", "automated-cleaning"),
 					CredentialsName:                "bmc-credentials",
 					DisableCertificateVerification: bmc.DisableCertificateVerification,
 				},
-				BootMode:              metal3api.Legacy,
+				BootMode:              metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress:        bmc.BootMacAddress,
 				AutomatedCleaningMode: metal3api.CleaningModeMetadata,
 			},
diff --git a/test/e2e/basic_ops_test.go b/test/e2e/basic_ops_test.go
@@ -61,7 +61,7 @@ var _ = Describe("basic", Label("required", "basic"), func() {
 					CredentialsName:                "bmc-credentials",
 					DisableCertificateVerification: bmc.DisableCertificateVerification,
 				},
-				BootMode:       metal3api.Legacy,
+				BootMode:       metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress: bmc.BootMacAddress,
 			},
 		}
diff --git a/test/e2e/config/fixture.yaml b/test/e2e/config/fixture.yaml
@@ -35,6 +35,8 @@ variables:
   CERT_MANAGER_VERSION: "v1.17.1"
   SSH_CHECK_PROVISIONED: "false"
   FETCH_IRONIC_NODES: "false"
+  # Boot mode can be legacy, UEFI or UEFISecureBoot
+  BOOT_MODE: "UEFI"
 
   NAMESPACE_SCOPED: "false"
 
diff --git a/test/e2e/config/ironic.yaml b/test/e2e/config/ironic.yaml
@@ -55,6 +55,8 @@ variables:
   IRONIC_PASSWORD: "changeme"
   IRONIC_PROVISIONING_IP: "192.168.222.2"
   IRONIC_PROVISIONING_PORT: "6385"
+  # Boot mode can be legacy, UEFI or UEFISecureBoot
+  BOOT_MODE: "UEFI"
 
   NAMESPACE_SCOPED: "true"
 
diff --git a/test/e2e/external_inspection_test.go b/test/e2e/external_inspection_test.go
@@ -213,7 +213,7 @@ var _ = Describe("External Inspection", Label("required", "external-inspection")
 					CredentialsName:                "bmc-credentials",
 					DisableCertificateVerification: bmc.DisableCertificateVerification,
 				},
-				BootMode:       metal3api.Legacy,
+				BootMode:       metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress: bmc.BootMacAddress,
 			},
 		}
@@ -284,7 +284,7 @@ var _ = Describe("External Inspection", Label("required", "external-inspection")
 					CredentialsName:                "bmc-credentials",
 					DisableCertificateVerification: bmc.DisableCertificateVerification,
 				},
-				BootMode:       metal3api.Legacy,
+				BootMode:       metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress: bmc.BootMacAddress,
 				InspectionMode: metal3api.InspectionModeDisabled,
 			},
diff --git a/test/e2e/inspection_test.go b/test/e2e/inspection_test.go
@@ -140,7 +140,7 @@ var _ = Describe("Inspection", Label("required", "inspection"), func() {
 					CredentialsName:                "bmc-credentials",
 					DisableCertificateVerification: bmc.DisableCertificateVerification,
 				},
-				BootMode:       metal3api.Legacy,
+				BootMode:       metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress: bmc.BootMacAddress,
 			},
 		}
diff --git a/test/e2e/live_iso_test.go b/test/e2e/live_iso_test.go
@@ -78,7 +78,7 @@ var _ = Describe("Live-ISO", Label("required", "live-iso"), func() {
 					URL:        imageURL,
 					DiskFormat: pointer.String("live-iso"),
 				},
-				BootMode:              metal3api.Legacy,
+				BootMode:              metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress:        bmc.BootMacAddress,
 				AutomatedCleaningMode: metal3api.CleaningModeDisabled,
 			},
diff --git a/test/e2e/provisioning_and_annotation_test.go b/test/e2e/provisioning_and_annotation_test.go
@@ -63,7 +63,7 @@ var _ = Describe("Provision, detach, recreate from status and deprovision", Labe
 						CredentialsName:                "bmc-credentials",
 						DisableCertificateVerification: bmc.DisableCertificateVerification,
 					},
-					BootMode:              metal3api.Legacy,
+					BootMode:              metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 					BootMACAddress:        bmc.BootMacAddress,
 					AutomatedCleaningMode: "disabled",
 				},
@@ -208,7 +208,7 @@ var _ = Describe("Provision, detach, recreate from status and deprovision", Labe
 						CredentialsName:                "bmc-credentials",
 						DisableCertificateVerification: bmc.DisableCertificateVerification,
 					},
-					BootMode:              metal3api.Legacy,
+					BootMode:              metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 					BootMACAddress:        bmc.BootMacAddress,
 					AutomatedCleaningMode: "disabled",
 					Image: &metal3api.Image{
diff --git a/test/e2e/re_inspection_test.go b/test/e2e/re_inspection_test.go
@@ -63,7 +63,7 @@ var _ = Describe("Re-Inspection", Label("required", "re-inspection"), func() {
 					CredentialsName:                "bmc-credentials",
 					DisableCertificateVerification: bmc.DisableCertificateVerification,
 				},
-				BootMode:       metal3api.Legacy,
+				BootMode:       metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 				BootMACAddress: bmc.BootMacAddress,
 			},
 		}
diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go
@@ -270,7 +270,7 @@ func RunUpgradeTest(ctx context.Context, input *BMOIronicUpgradeInput, upgradeCl
 				CredentialsName:                secretName,
 				DisableCertificateVerification: bmc.DisableCertificateVerification,
 			},
-			BootMode:       metal3api.Legacy,
+			BootMode:       metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),
 			BootMACAddress: bmc.BootMacAddress,
 		},
 	}
diff --git a/test/vbmctl/templates/VM.xml.tpl b/test/vbmctl/templates/VM.xml.tpl
@@ -3,7 +3,7 @@
   <memory unit='KiB'>4194304</memory>
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>2</vcpu>
-  <os>
+  <os firmware="efi">
     <type arch='x86_64' machine='pc-q35-6.2'>hvm</type>
     <boot dev='hd'/>
   </os>

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ var _ = Describe("basic", Label("required", "basic"), func() {`
`61`	`61`	`CredentialsName: "bmc-credentials",`
`62`	`62`	`DisableCertificateVerification: bmc.DisableCertificateVerification,`
`63`	`63`	`},`
`64`		`- BootMode: metal3api.Legacy,`
	`64`	`+ BootMode: metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),`
`65`	`65`	`BootMACAddress: bmc.BootMacAddress,`
`66`	`66`	`},`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ var _ = Describe("Inspection", Label("required", "inspection"), func() {`
`140`	`140`	`CredentialsName: "bmc-credentials",`
`141`	`141`	`DisableCertificateVerification: bmc.DisableCertificateVerification,`
`142`	`142`	`},`
`143`		`- BootMode: metal3api.Legacy,`
	`143`	`+ BootMode: metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),`
`144`	`144`	`BootMACAddress: bmc.BootMacAddress,`
`145`	`145`	`},`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ var _ = Describe("Re-Inspection", Label("required", "re-inspection"), func() {`
`63`	`63`	`CredentialsName: "bmc-credentials",`
`64`	`64`	`DisableCertificateVerification: bmc.DisableCertificateVerification,`
`65`	`65`	`},`
`66`		`- BootMode: metal3api.Legacy,`
	`66`	`+ BootMode: metal3api.BootMode(e2eConfig.GetVariable("BOOT_MODE")),`
`67`	`67`	`BootMACAddress: bmc.BootMacAddress,`
`68`	`68`	`},`
`69`	`69`	`}`