metal3: add e2e tests

honza · honza · commit 512d05798749 · 2025-04-04T14:19:10.000-03:00
diff --git a/e2e/aws_test.go b/e2e/aws_test.go
@@ -71,6 +71,7 @@ var _ = Describe("Cluster API AWS MachineSet", Ordered, func() {
 				APIVersion: infraAPIVersion,
 				Name:       awsMachineTemplateName,
 			},
+			"worker-user-data",
 		))
 
 		framework.WaitForMachineSet(cl, machineSet.Name)
diff --git a/e2e/azure_test.go b/e2e/azure_test.go
@@ -63,6 +63,7 @@ var _ = Describe("Cluster API Azure MachineSet", Ordered, func() {
 				APIVersion: infraAPIVersion,
 				Name:       azureMachineTemplateName,
 			},
+			"worker-user-data",
 		))
 
 		framework.WaitForMachineSet(cl, machineSet.Name)
diff --git a/e2e/baremetal_test.go b/e2e/baremetal_test.go
@@ -0,0 +1,138 @@
+package e2e
+
+import (
+	"fmt"
+
+	bmov1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
+	metal3v1 "github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	yaml "sigs.k8s.io/yaml"
+
+	configv1 "github.com/openshift/api/config/v1"
+	mapiv1 "github.com/openshift/api/machine/v1beta1"
+	bmv1alpha1 "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
+	"github.com/openshift/cluster-capi-operator/e2e/framework"
+)
+
+const (
+	baremetalMachineTemplateName = "baremetal-machine-template"
+)
+
+var _ = Describe("Cluster API Baremetal MachineSet", Ordered, func() {
+	var baremetalMachineTemplate *metal3v1.Metal3MachineTemplate
+	var machineSet *clusterv1.MachineSet
+	var mapiMachineSpec *bmv1alpha1.BareMetalMachineProviderSpec
+
+	BeforeAll(func() {
+		if platform != configv1.BareMetalPlatformType {
+			Skip("Skipping Baremetal E2E tests")
+		}
+		mapiMachineSpec = getBaremetalMAPIProviderSpec(cl)
+	})
+
+	AfterEach(func() {
+		if platform != configv1.BareMetalPlatformType {
+			// Because AfterEach always runs, even when tests are skipped, we have to
+			// explicitly skip it here for other platforms.
+			Skip("Skipping Baremetal E2E tests")
+		}
+		framework.DeleteMachineSets(cl, machineSet)
+		framework.WaitForMachineSetsDeleted(cl, machineSet)
+		framework.DeleteObjects(cl, baremetalMachineTemplate)
+	})
+
+	It("should be able to run a machine", func() {
+		key := client.ObjectKey{
+			Namespace: "openshift-cluster-api",
+			Name:      "ostest-extraworker-0", // name provided by dev-scripts in CI
+		}
+
+		waitForBaremetalHostState(cl, key, bmov1alpha1.StateAvailable)
+
+		baremetalMachineTemplate = createBaremetalMachineTemplate(cl, mapiMachineSpec)
+
+		machineSet = framework.CreateMachineSet(cl, framework.NewMachineSetParams(
+			"baremetal-machineset",
+			clusterName,
+			"", // mapiMachineSpec.Zone,
+			1,
+			corev1.ObjectReference{
+				Kind:       "Metal3MachineTemplate",
+				APIVersion: infraAPIVersion,
+				Name:       baremetalMachineTemplateName,
+			},
+			"worker-user-data-managed",
+		))
+
+		framework.WaitForMachineSet(cl, machineSet.Name)
+	})
+})
+
+func waitForBaremetalHostState(cl client.Client, key client.ObjectKey, state bmov1alpha1.ProvisioningState) {
+	By(fmt.Sprintf("waiting for baremetal host to become %s", state))
+
+	Eventually(func() error {
+		bmh := bmov1alpha1.BareMetalHost{}
+
+		err := cl.Get(ctx, key, &bmh)
+		if err != nil {
+			return err
+		}
+
+		if bmh.Status.Provisioning.State != state {
+			return fmt.Errorf("baremetalhost is not %s", state)
+		}
+
+		return nil
+	}, framework.WaitOverLong, framework.RetryLong).Should(Succeed())
+
+}
+
+func getBaremetalMAPIProviderSpec(cl client.Client) *bmv1alpha1.BareMetalMachineProviderSpec {
+	machineSetList := &mapiv1.MachineSetList{}
+	Expect(cl.List(ctx, machineSetList, client.InNamespace(framework.MAPINamespace))).To(Succeed())
+
+	Expect(machineSetList.Items).ToNot(HaveLen(0))
+	machineSet := machineSetList.Items[0]
+	Expect(machineSet.Spec.Template.Spec.ProviderSpec.Value).ToNot(BeNil())
+
+	providerSpec := &bmv1alpha1.BareMetalMachineProviderSpec{}
+	Expect(yaml.Unmarshal(machineSet.Spec.Template.Spec.ProviderSpec.Value.Raw, providerSpec)).To(Succeed())
+
+	return providerSpec
+}
+
+func createBaremetalMachineTemplate(cl client.Client, mapiProviderSpec *bmv1alpha1.BareMetalMachineProviderSpec) *metal3v1.Metal3MachineTemplate {
+	By("Creating Baremetal machine template")
+
+	baremetalMachineSpec := metal3v1.Metal3MachineSpec{
+		CustomDeploy: &metal3v1.CustomDeploy{
+			Method: "install_coreos",
+		},
+		UserData: mapiProviderSpec.UserData,
+	}
+
+	baremetalMachineTemplate := &metal3v1.Metal3MachineTemplate{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      baremetalMachineTemplateName,
+			Namespace: framework.CAPINamespace,
+		},
+		Spec: metal3v1.Metal3MachineTemplateSpec{
+			Template: metal3v1.Metal3MachineTemplateResource{
+				Spec: baremetalMachineSpec,
+			},
+		},
+	}
+
+	if err := cl.Create(ctx, baremetalMachineTemplate); err != nil && !apierrors.IsAlreadyExists(err) {
+		Expect(err).ToNot(HaveOccurred())
+	}
+
+	return baremetalMachineTemplate
+}
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	bmov1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
+	metal3v1 "github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -44,6 +46,8 @@ func init() {
 	utilruntime.Must(mapiv1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(ibmpowervsv1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(vspherev1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(metal3v1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(bmov1alpha1.AddToScheme(scheme.Scheme))
 }
 
 func TestAPIs(t *testing.T) {
diff --git a/e2e/framework/framework.go b/e2e/framework/framework.go
@@ -16,6 +16,7 @@ const (
 
 	RetryShort  = 1 * time.Second
 	RetryMedium = 5 * time.Second
+	RetryLong   = 10 * time.Second
 )
 
 var (
diff --git a/e2e/framework/machineset.go b/e2e/framework/machineset.go
@@ -19,10 +19,11 @@ type machineSetParams struct {
 	failureDomain     string
 	replicas          int32
 	infrastructureRef corev1.ObjectReference
+	userDataSecret    string
 }
 
 // NewMachineSetParams returns a new machineSetParams object.
-func NewMachineSetParams(msName, clusterName, failureDomain string, replicas int32, infrastructureRef corev1.ObjectReference) machineSetParams {
+func NewMachineSetParams(msName, clusterName, failureDomain string, replicas int32, infrastructureRef corev1.ObjectReference, userDataSecretName string) machineSetParams {
 	Expect(msName).ToNot(BeEmpty())
 	Expect(clusterName).ToNot(BeEmpty())
 	Expect(infrastructureRef.APIVersion).ToNot(BeEmpty())
@@ -35,14 +36,14 @@ func NewMachineSetParams(msName, clusterName, failureDomain string, replicas int
 		replicas:          replicas,
 		infrastructureRef: infrastructureRef,
 		failureDomain:     failureDomain,
+		userDataSecret:    userDataSecretName,
 	}
 }
 
 // CreateMachineSet creates a new MachineSet resource.
 func CreateMachineSet(cl client.Client, params machineSetParams) *clusterv1.MachineSet {
 	By(fmt.Sprintf("Creating MachineSet %q", params.msName))
 
-	userDataSecret := "worker-user-data"
 	ms := &clusterv1.MachineSet{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "MachineSet",
@@ -70,7 +71,7 @@ func CreateMachineSet(cl client.Client, params machineSetParams) *clusterv1.Mach
 				},
 				Spec: clusterv1.MachineSpec{
 					Bootstrap: clusterv1.Bootstrap{
-						DataSecretName: &userDataSecret,
+						DataSecretName: &params.userDataSecret,
 					},
 					ClusterName:       params.clusterName,
 					InfrastructureRef: params.infrastructureRef,
diff --git a/e2e/gcp_test.go b/e2e/gcp_test.go
@@ -58,6 +58,7 @@ var _ = Describe("Cluster API GCP MachineSet", Ordered, func() {
 				APIVersion: infraAPIVersion,
 				Name:       gcpMachineTemplateName,
 			},
+			"worker-user-data",
 		))
 
 		framework.WaitForMachineSet(cl, machineSet.Name)
diff --git a/e2e/go.mod b/e2e/go.mod
@@ -5,9 +5,12 @@ go 1.22.7
 require (
 	github.com/aws/aws-sdk-go v1.55.5
 	github.com/google/go-cmp v0.6.0
+	github.com/metal3-io/baremetal-operator/apis v0.5.1
+	github.com/metal3-io/cluster-api-provider-metal3/api v1.7.0
 	github.com/onsi/ginkgo/v2 v2.22.2
 	github.com/onsi/gomega v1.36.2
-	github.com/openshift/api v0.0.0-20220921125526-1866ef90edbf
+	github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215
+	github.com/openshift/cluster-api-provider-baremetal v0.0.0-20250115114740-9abe67f18345
 	k8s.io/api v0.31.5
 	k8s.io/apimachinery v0.31.5
 	k8s.io/client-go v0.31.5
@@ -66,6 +69,8 @@ require (
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
+	github.com/metal3-io/ip-address-manager/api v1.8.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -102,3 +107,9 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
+
+replace github.com/metal3-io/cluster-api-provider-metal3/api => github.com/openshift/cluster-api-provider-metal3/api v0.0.0-20241120153823-7baca400194b
+
+replace github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20241114005417-044448aafa02
+
+replace github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20241114005417-044448aafa02
diff --git a/e2e/go.sum b/e2e/go.sum
@@ -135,6 +135,10 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
+github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
+github.com/metal3-io/ip-address-manager/api v1.8.0 h1:qEemVSb45uDbbQonr2StMV21RfSKNSO/NrPnhApV90w=
+github.com/metal3-io/ip-address-manager/api v1.8.0/go.mod h1:0PjnN4ke64Jh6A3U04mMvV2sBwePa7HKkiZXazktCTk=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -154,8 +158,14 @@ github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU
 github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
-github.com/openshift/api v0.0.0-20220921125526-1866ef90edbf h1:Bohu/gUxpyuTjQx2m01DFNgtGMy3wtti6s7mJ+Gtblc=
-github.com/openshift/api v0.0.0-20220921125526-1866ef90edbf/go.mod h1:HJAEIh4gLXPDdWxgCbvmJjzd9QIxyPZJtPU0u2W4vH4=
+github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215 h1:NY9X6aNRa3PKTRj9nTncCoGRbdwiis2CL1T3miXxjoc=
+github.com/openshift/api v0.0.0-20240731195412-e863d9f8a215/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+github.com/openshift/baremetal-operator/apis v0.0.0-20241114005417-044448aafa02 h1:vO/LZ1E8DXXz4FobR07oMIC5EB7ndkYT194Tp7hEXso=
+github.com/openshift/baremetal-operator/apis v0.0.0-20241114005417-044448aafa02/go.mod h1:tO+nL2r12/n6CC6gVj/K80R2v0fpEnBC1FYq5vCG3ns=
+github.com/openshift/cluster-api-provider-baremetal v0.0.0-20250115114740-9abe67f18345 h1:UPAGeMlifNdLqmyLTJK0FXvpYkWRmm49zSXDFDHNoP4=
+github.com/openshift/cluster-api-provider-baremetal v0.0.0-20250115114740-9abe67f18345/go.mod h1:TLLzqNgDqYeK8Dd9hCSS4aeracFqF1XT3uTQuKn9F4o=
+github.com/openshift/cluster-api-provider-metal3/api v0.0.0-20241120153823-7baca400194b h1:2rBYzD6R2cZenK2BgbHrM0WB9PyP6pIwiwIk+LldXTA=
+github.com/openshift/cluster-api-provider-metal3/api v0.0.0-20241120153823-7baca400194b/go.mod h1:T66OjXF5yGNJSuQ/xtHOTfVDxG44Jdafzy+nHwbrg0A=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
diff --git a/e2e/powervs_test.go b/e2e/powervs_test.go
@@ -61,6 +61,7 @@ var _ = Describe("Cluster API IBMPowerVS MachineSet", Ordered, func() {
 				APIVersion: powerVSMachineTemplateVersion,
 				Name:       powerVSMachineTemplateName,
 			},
+			"worker-user-data",
 		))
 		framework.WaitForMachineSet(cl, machineSet.Name)
 	})
diff --git a/e2e/vsphere_test.go b/e2e/vsphere_test.go
@@ -62,6 +62,7 @@ var _ = Describe("Cluster API vSphere MachineSet", Ordered, func() {
 				APIVersion: infraAPIVersion,
 				Name:       vSphereMachineTemplateName,
 			},
+			"worker-user-data",
 		))
 
 		framework.WaitForMachineSet(cl, machineSet.Name)

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ const (`
`16`	`16`
`17`	`17`	`RetryShort = 1 * time.Second`
`18`	`18`	`RetryMedium = 5 * time.Second`
	`19`	`+ RetryLong = 10 * time.Second`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`var (`