Skip to content

Commit 8d5cd7f

Browse files
lentzi90lentzi90
committed
E2E: Make use of DisableCertificateVerification setting
This enables the E2E tests to disable certificate verification depending on the value in the BMCs config file. It can be useful if running the suite against real hardware. Signed-off-by: Lennart Jern <[email protected]>
1 parent 7085ea4 commit 8d5cd7f

9 files changed

+36
-24
lines changed

‎test/e2e/automated_cleaning_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ var _ = Describe("Automated cleaning", Label("required", "automated-cleaning"),
5555
Spec: metal3api.BareMetalHostSpec{
5656
Online: true,
5757
BMC: metal3api.BMCDetails{
58-
Address: bmc.Address,
59-
CredentialsName: "bmc-credentials",
58+
Address: bmc.Address,
59+
CredentialsName: "bmc-credentials",
60+
DisableCertificateVerification: bmc.DisableCertificateVerification,
6061
},
6162
BootMode: metal3api.Legacy,
6263
BootMACAddress: bmc.BootMacAddress,

‎test/e2e/basic_ops_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ var _ = Describe("basic", Label("required", "basic"), func() {
5757
Spec: metal3api.BareMetalHostSpec{
5858
Online: true,
5959
BMC: metal3api.BMCDetails{
60-
Address: bmc.Address,
61-
CredentialsName: "bmc-credentials",
60+
Address: bmc.Address,
61+
CredentialsName: "bmc-credentials",
62+
DisableCertificateVerification: bmc.DisableCertificateVerification,
6263
},
6364
BootMode: metal3api.Legacy,
6465
BootMACAddress: bmc.BootMacAddress,

‎test/e2e/external_inspection_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,9 @@ var _ = Describe("External Inspection", Label("required", "external-inspection")
209209
},
210210
Spec: metal3api.BareMetalHostSpec{
211211
BMC: metal3api.BMCDetails{
212-
Address: bmc.Address,
213-
CredentialsName: "bmc-credentials",
212+
Address: bmc.Address,
213+
CredentialsName: "bmc-credentials",
214+
DisableCertificateVerification: bmc.DisableCertificateVerification,
214215
},
215216
BootMode: metal3api.Legacy,
216217
BootMACAddress: bmc.BootMacAddress,

‎test/e2e/externally_provisioned_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ var _ = Describe("Create as externally provisioned, deprovision", Label("require
5454
Spec: metal3api.BareMetalHostSpec{
5555
Online: true,
5656
BMC: metal3api.BMCDetails{
57-
Address: bmc.Address,
58-
CredentialsName: "bmc-credentials",
57+
Address: bmc.Address,
58+
CredentialsName: "bmc-credentials",
59+
DisableCertificateVerification: bmc.DisableCertificateVerification,
5960
},
6061
BootMACAddress: bmc.BootMacAddress,
6162
ExternallyProvisioned: true,

‎test/e2e/inspection_test.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ var _ = Describe("Inspection", Label("required", "inspection"), func() {
8484
},
8585
Spec: metal3api.BareMetalHostSpec{
8686
BMC: metal3api.BMCDetails{
87-
Address: "ipmi://127.0.0.1:5678",
88-
CredentialsName: "bmc-credentials",
87+
Address: "ipmi://127.0.0.1:5678",
88+
CredentialsName: "bmc-credentials",
89+
DisableCertificateVerification: bmc.DisableCertificateVerification,
8990
},
9091
},
9192
}
@@ -135,8 +136,9 @@ var _ = Describe("Inspection", Label("required", "inspection"), func() {
135136
},
136137
Spec: metal3api.BareMetalHostSpec{
137138
BMC: metal3api.BMCDetails{
138-
Address: bmc.Address,
139-
CredentialsName: "bmc-credentials",
139+
Address: bmc.Address,
140+
CredentialsName: "bmc-credentials",
141+
DisableCertificateVerification: bmc.DisableCertificateVerification,
140142
},
141143
BootMode: metal3api.Legacy,
142144
BootMACAddress: bmc.BootMacAddress,
@@ -188,8 +190,9 @@ var _ = Describe("Inspection", Label("required", "inspection"), func() {
188190
},
189191
Spec: metal3api.BareMetalHostSpec{
190192
BMC: metal3api.BMCDetails{
191-
Address: bmc.Address,
192-
CredentialsName: "bmc-credentials-new",
193+
Address: bmc.Address,
194+
CredentialsName: "bmc-credentials-new",
195+
DisableCertificateVerification: bmc.DisableCertificateVerification,
193196
},
194197
BootMode: metal3api.Legacy,
195198
BootMACAddress: bmc.BootMacAddress,

‎test/e2e/live_iso_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ var _ = Describe("Live-ISO", Label("required", "live-iso"), func() {
7070
Spec: metal3api.BareMetalHostSpec{
7171
Online: true,
7272
BMC: metal3api.BMCDetails{
73-
Address: bmc.Address,
74-
CredentialsName: secretName,
73+
Address: bmc.Address,
74+
CredentialsName: secretName,
75+
DisableCertificateVerification: bmc.DisableCertificateVerification,
7576
},
7677
Image: &metal3api.Image{
7778
URL: imageURL,

‎test/e2e/provisioning_and_annotation_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ var _ = Describe("Provision, detach, recreate from status and deprovision", Labe
5959
Spec: metal3api.BareMetalHostSpec{
6060
Online: true,
6161
BMC: metal3api.BMCDetails{
62-
Address: bmc.Address,
63-
CredentialsName: "bmc-credentials",
62+
Address: bmc.Address,
63+
CredentialsName: "bmc-credentials",
64+
DisableCertificateVerification: bmc.DisableCertificateVerification,
6465
},
6566
BootMode: metal3api.Legacy,
6667
BootMACAddress: bmc.BootMacAddress,
@@ -203,8 +204,9 @@ var _ = Describe("Provision, detach, recreate from status and deprovision", Labe
203204
Spec: metal3api.BareMetalHostSpec{
204205
Online: true,
205206
BMC: metal3api.BMCDetails{
206-
Address: bmc.Address,
207-
CredentialsName: "bmc-credentials",
207+
Address: bmc.Address,
208+
CredentialsName: "bmc-credentials",
209+
DisableCertificateVerification: bmc.DisableCertificateVerification,
208210
},
209211
BootMode: metal3api.Legacy,
210212
BootMACAddress: bmc.BootMacAddress,

‎test/e2e/re_inspection_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ var _ = Describe("Re-Inspection", Label("required", "re-inspection"), func() {
5959
},
6060
Spec: metal3api.BareMetalHostSpec{
6161
BMC: metal3api.BMCDetails{
62-
Address: bmc.Address,
63-
CredentialsName: "bmc-credentials",
62+
Address: bmc.Address,
63+
CredentialsName: "bmc-credentials",
64+
DisableCertificateVerification: bmc.DisableCertificateVerification,
6465
},
6566
BootMode: metal3api.Legacy,
6667
BootMACAddress: bmc.BootMacAddress,

‎test/e2e/upgrade_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,9 @@ func RunUpgradeTest(ctx context.Context, input *BMOIronicUpgradeInput, upgradeCl
263263
Spec: metal3api.BareMetalHostSpec{
264264
Online: true,
265265
BMC: metal3api.BMCDetails{
266-
Address: bmc.Address,
267-
CredentialsName: secretName,
266+
Address: bmc.Address,
267+
CredentialsName: secretName,
268+
DisableCertificateVerification: bmc.DisableCertificateVerification,
268269
},
269270
BootMode: metal3api.Legacy,
270271
BootMACAddress: bmc.BootMacAddress,

0 commit comments

Comments
 (0)