🌱 Re-inspection by annotation test added #1402

adilGhaffarDev · 2023-10-24T07:16:04Z

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1369

adilGhaffarDev · 2023-10-24T07:18:44Z

/metal3-bmo-e2e-test

test/e2e/inspection_test.go

hardys · 2023-10-24T08:01:44Z

/cc @lentzi90 @dtantsur

lentzi90 · 2023-10-24T14:15:52Z

Sorry for unrelated triggers... we have issues with prow so I'm debugging.
/test unit

lentzi90 · 2023-10-24T14:20:13Z

/test unit

lentzi90 · 2023-10-24T16:55:25Z

/test unit

lentzi90 · 2023-10-31T08:15:49Z

/metal3-bmo-e2e-test

lentzi90 · 2023-10-31T08:16:56Z

test/e2e/config/fixture.yaml

@@ -31,6 +31,7 @@ intervals:
  inspection/wait-inspecting: ["5s", "10ms"]
  inspection/wait-available: ["5s", "1ms"]
  external-inspection/wait-available: ["5s", "1ms"]
+  re-inspection/wait-available: ["5m", "1s"]


Probably we can reuse here inspection/wait-available?
Edit: I think probably inspection/wait-available should be changed to default/wait-available since this is what we have in ironic.yaml. Probably missed to change it here before.

I added a new one because the others were very small and re-inspection was taking some time. Should I change default/wait-available: in both fixture and ironic to ["10m", "10s"] and use that instead?

Fixture is different it should not take much time. Let me check!

available after re-inspection almost takes 3 minutes I think:

STEP: waiting for the BMH to become available after re-inspection @ 10/31/23 08:40:01.681 STEP: checking that the hardware details are corrected after re-inspection @ 10/31/23 08:42:54.127

For fixture it takes less than a second most of the time.

STEP: adding InspectAnnotation to re-inspect @ 10/31/23 10:54:30.718 STEP: waiting for the BMH to be in inspecting state after inspection annotaion @ 10/31/23 10:54:30.739 STEP: waiting for the BMH to become available after re-inspection @ 10/31/23 10:54:30.756 STEP: checking that the hardware details are corrected after re-inspection @ 10/31/23 10:54:30.961

Fixture is not what runs of you use the ci-e2e.sh script. If you want to run it you need to check the bottom of the readme here: https://github.com/metal3-io/baremetal-operator/blob/main/test/e2e/README.md

One more thing! If you run into any issues running the tests with the fixture provider on Mac, please bring them up! I want this to be easy for developers to run 🙂

I was running tests in VM but I will try on my mac too.

lentzi90 · 2023-10-31T08:17:54Z

test/e2e/config/ironic.yaml

@@ -32,6 +32,7 @@ intervals:
  default/wait-registering: ["1m", "5s"]
  inspection/wait-registration-error: ["1m", "5s"]
  external-inspection/wait-available: ["20s", "1s"]
+  re-inspection/wait-available: ["5m", "1s"]


Here we could probably reuse default/wait-available. I don't think re-inspection would have different timing from normal inspection.

lentzi90 · 2023-10-31T09:33:01Z

test/e2e/re_inspection_test.go

lentzi90 · 2023-10-31T09:34:57Z

test/e2e/inspection_test.go

I think we don't need the changes in this file. It is enough with the separate re-inspection test

oh I forgot to remove it. let me change it

lentzi90 · 2023-10-31T11:05:48Z

test/e2e/re_inspection_test.go

+		By("checking that the hardware details are corrected after re-inspection")
+		key = types.NamespacedName{Namespace: bmh.Namespace, Name: bmh.Name}
+		Expect(clusterProxy.GetClient().Get(ctx, key, &bmh)).To(Succeed())
+		Expect(bmh.Status.HardwareDetails.Hostname).To(Equal(rightHostName))


We need to make this configurable so that the test can be used in other contexts. I think it will be fine to just add a variable to the e2e config with the expected hostname. To verify that it works, we can check with the fixture provider. The hardware details that it returns are hard coded here:

baremetal-operator/pkg/provisioner/fixture/fixture.go

Lines 136 to 176 in 3874f1e

&metal3api.HardwareDetails{

RAMMebibytes: 128 * 1024,

NIC: []metal3api.NIC{

{

Name: "nic-1",

Model: "virt-io",

MAC: "ab:cd:12:34:56:78",

IP: "192.168.100.1",

SpeedGbps: 1,

PXE: true,

},

{

Name: "nic-2",

Model: "e1000",

MAC: "12:34:56:78:ab:cd",

IP: "192.168.100.2",

SpeedGbps: 1,

PXE: false,

},

},

Storage: []metal3api.Storage{

{

Name: "disk-1 (boot)",

Rotational: false,

SizeBytes: metal3api.TebiByte * 93,

Model: "Dell CFJ61",

},

{

Name: "disk-2",

Rotational: false,

SizeBytes: metal3api.TebiByte * 93,

Model: "Dell CFJ61",

},

},

CPU: metal3api.CPU{

Arch: "x86_64",

Model: "FancyPants CPU",

ClockMegahertz: 3.0 * metal3api.GigaHertz,

Flags: []string{"fpu", "hypervisor", "sse", "vmx"},

Count: 1,

},

As you can see it does not set any hostname, so for fixture we would set "". If we can get the test passing on both fixture and ironic with separate e2e configs then it should be flexible enough for other environments also 🙂

added in e2e config, please check

lentzi90 · 2023-11-01T07:38:13Z

/metal3-bmo-e2e-test

lentzi90

Awesome job!
/lgtm

lentzi90 · 2023-11-01T08:14:04Z

/cc @kashifest

kashifest

/approve

metal3-io-bot · 2023-11-01T08:30:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kashifest

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kashifest]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

lentzi90 · 2023-11-01T08:32:26Z

/test-ubuntu-integration-main
/test-centos-e2e-integration-main

metal3-io-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 24, 2023

hardys reviewed Oct 24, 2023

View reviewed changes

test/e2e/inspection_test.go Outdated Show resolved Hide resolved

metal3-io-bot requested review from dtantsur and lentzi90 October 24, 2023 08:01

adilGhaffarDev force-pushed the re-inspection-test/adil branch 2 times, most recently from 2af3d6d to 9fdb68c Compare October 30, 2023 14:33

metal3-io-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 30, 2023

adilGhaffarDev force-pushed the re-inspection-test/adil branch from 9fdb68c to 245ef64 Compare October 30, 2023 15:03

adilGhaffarDev requested a review from hardys October 31, 2023 08:09

lentzi90 reviewed Oct 31, 2023

View reviewed changes

adilGhaffarDev force-pushed the re-inspection-test/adil branch from 245ef64 to 8f19c5a Compare October 31, 2023 15:07

Re-inspection by annotation test added

ebbbefa

adilGhaffarDev force-pushed the re-inspection-test/adil branch from 8f19c5a to ebbbefa Compare October 31, 2023 15:15

lentzi90 reviewed Nov 1, 2023

View reviewed changes

metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2023

metal3-io-bot requested a review from kashifest November 1, 2023 08:14

kashifest reviewed Nov 1, 2023

View reviewed changes

metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 1, 2023

metal3-io-bot merged commit 1e6f455 into metal3-io:main Nov 1, 2023
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Re-inspection by annotation test added #1402

🌱 Re-inspection by annotation test added #1402

adilGhaffarDev commented Oct 24, 2023 •

edited

adilGhaffarDev commented Oct 24, 2023

hardys commented Oct 24, 2023

lentzi90 commented Oct 24, 2023

lentzi90 commented Oct 24, 2023

lentzi90 commented Oct 24, 2023

lentzi90 commented Oct 31, 2023

lentzi90 Oct 31, 2023

adilGhaffarDev Oct 31, 2023

lentzi90 Oct 31, 2023

adilGhaffarDev Oct 31, 2023

lentzi90 Oct 31, 2023

lentzi90 Oct 31, 2023

adilGhaffarDev Oct 31, 2023

lentzi90 Oct 31, 2023

lentzi90 Oct 31, 2023

lentzi90 Oct 31, 2023

adilGhaffarDev Oct 31, 2023

lentzi90 Oct 31, 2023

adilGhaffarDev Oct 31, 2023

lentzi90 commented Nov 1, 2023

lentzi90 left a comment

lentzi90 commented Nov 1, 2023

kashifest left a comment

metal3-io-bot commented Nov 1, 2023

lentzi90 commented Nov 1, 2023

	&metal3api.HardwareDetails{
	RAMMebibytes: 128 * 1024,
	NIC: []metal3api.NIC{
	{
	Name: "nic-1",
	Model: "virt-io",
	MAC: "ab:cd:12:34:56:78",
	IP: "192.168.100.1",
	SpeedGbps: 1,
	PXE: true,
	},
	{
	Name: "nic-2",
	Model: "e1000",
	MAC: "12:34:56:78:ab:cd",
	IP: "192.168.100.2",
	SpeedGbps: 1,
	PXE: false,
	},
	},
	Storage: []metal3api.Storage{
	{
	Name: "disk-1 (boot)",
	Rotational: false,
	SizeBytes: metal3api.TebiByte * 93,
	Model: "Dell CFJ61",
	},
	{
	Name: "disk-2",
	Rotational: false,
	SizeBytes: metal3api.TebiByte * 93,
	Model: "Dell CFJ61",
	},
	},
	CPU: metal3api.CPU{
	Arch: "x86_64",
	Model: "FancyPants CPU",
	ClockMegahertz: 3.0 * metal3api.GigaHertz,
	Flags: []string{"fpu", "hypervisor", "sse", "vmx"},
	Count: 1,
	},

🌱 Re-inspection by annotation test added #1402

🌱 Re-inspection by annotation test added #1402

Conversation

adilGhaffarDev commented Oct 24, 2023 • edited

adilGhaffarDev commented Oct 24, 2023

hardys commented Oct 24, 2023

lentzi90 commented Oct 24, 2023

lentzi90 commented Oct 24, 2023

lentzi90 commented Oct 24, 2023

lentzi90 commented Oct 31, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lentzi90 commented Nov 1, 2023

lentzi90 left a comment

Choose a reason for hiding this comment

lentzi90 commented Nov 1, 2023

kashifest left a comment

Choose a reason for hiding this comment

metal3-io-bot commented Nov 1, 2023

lentzi90 commented Nov 1, 2023

adilGhaffarDev commented Oct 24, 2023 •

edited