Added lables and removed comments

e2 instances do not support onHostMaintenance=TERMINATE

Removed GPU case for now

Author: miyadav

pkg/capi/gcp.go

@@ -20,7 +20,6 @@ import (
 )
 
 const (
-	infraAPIVersion            = "infrastructure.cluster.x-k8s.io/v1beta1"
 	gcpMachineTemplateName     = "gcp-machine-template"
 	OnHostMaintenanceTerminate = "Terminate"
 	OnHostMaintenanceMigrate   = "Migrate"
@@ -71,17 +70,12 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 		framework.WaitForCAPIMachineSetsDeleted(ctx, cl, machineSet)
 		framework.DeleteObjects(ctx, cl, gcpMachineTemplate)
 	})
-	// OCP-77825 capi created instances support disks pd-ssd and pd-standard
-	// author: [email protected]
-	DescribeTable("should be able to run a machine with disk types",
+	DescribeTable("should be able to run a machine with disk types", framework.LabelCAPI, framework.LabelDisruptive,
 		func(expectedDiskType gcpv1.DiskType) {
 			mapiProviderSpec := getGCPMAPIProviderSpec(cl)
 			Expect(mapiProviderSpec).ToNot(BeNil())
 			gcpMachineTemplate = createGCPMachineTemplate(mapiProviderSpec)
 			gcpMachineTemplate.Spec.Template.Spec.RootDeviceType = &expectedDiskType
-			mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceTerminate
-			gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
-
 			if err := cl.Create(ctx, gcpMachineTemplate); err != nil && !apierrors.IsAlreadyExists(err) {
 				Expect(err).ToNot(HaveOccurred())
 			}
@@ -103,10 +97,7 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 		Entry("Disk type pd-standard", gcpv1.PdStandardDiskType),
 		Entry("Disk type pd-ssd", gcpv1.PdSsdDiskType),
 	)
-	// OCP-74795 - add support for shielded VMs - It takes defaults if configs are not supported; eg-vtpm alone set to Enabled will result in IntergrityMonitoring also as Enabled
-	// doesn't matter what we pass - all enabled/secureboot only disabled(default) are valid changes which we can apply
-	// author: [email protected]
-	DescribeTable("should configure Shielded VM options correctly",
+	DescribeTable("should configure Shielded VM options correctly", framework.LabelCAPI, framework.LabelDisruptive,
 		func(enableSecureBoot gcpv1.SecureBootPolicy, enableVtpm gcpv1.VirtualizedTrustedPlatformModulePolicy, enableIntegrityMonitoring gcpv1.IntegrityMonitoringPolicy) {
 			mapiProviderSpec := getGCPMAPIProviderSpec(cl)
 			Expect(mapiProviderSpec).ToNot(BeNil())
@@ -158,12 +149,10 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 		Entry("all Shielded VM options disabled", gcpv1.SecureBootPolicyDisabled, gcpv1.VirtualizedTrustedPlatformModulePolicyDisabled, gcpv1.IntegrityMonitoringPolicyDisabled),
 		*/
 	)
-	// OCP-74703 - Create confidential compute VMs on gcp
-	// author: [email protected]
 	// Define constants as variable for this case to pass values properly
 	confidentialComputeEnabled := gcpv1.ConfidentialComputePolicyEnabled
 	confidentialComputeDisabled := gcpv1.ConfidentialComputePolicyDisabled
-	DescribeTable("should configure Confidential VM correctly",
+	DescribeTable("should configure Confidential VM correctly", framework.LabelCAPI, framework.LabelDisruptive,
 		func(confidentialCompute *gcpv1.ConfidentialComputePolicy) {
 			mapiProviderSpec := getGCPMAPIProviderSpec(cl)
 			Expect(mapiProviderSpec).ToNot(BeNil())
@@ -211,48 +200,6 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 		Entry("Confidential Compute enabled", &confidentialComputeEnabled),
 		Entry("Confidential Compute disabled", &confidentialComputeDisabled),
 	)
-	// OCP-74732 GPU machine can be provisioned successfully by capi machineset
-	// author: [email protected]
-	It("should provision GPU machine successfully", func() {
-		mapiProviderSpec := getGCPMAPIProviderSpec(cl)
-		Expect(mapiProviderSpec).ToNot(BeNil())
-		gcpMachineTemplate = createGCPMachineTemplate(mapiProviderSpec)
-		gcpMachineTemplate.Spec.Template.Spec.InstanceType = "a2-highgpu-1g"
-		mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceTerminate
-		gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
-
-		if err := cl.Create(ctx, gcpMachineTemplate); err != nil && !apierrors.IsAlreadyExists(err) {
-			Expect(err).ToNot(HaveOccurred())
-		}
-
-		By("Creating a MachineSet for GPU machine")
-		machineSet, err = framework.CreateCAPIMachineSet(ctx, cl, framework.NewCAPIMachineSetParams(
-			"gcp-machineset-gpu-74732",
-			clusterName,
-			mapiProviderSpec.Zone,
-			1,
-			corev1.ObjectReference{
-				Kind:       "GCPMachineTemplate",
-				APIVersion: infraAPIVersion,
-				Name:       gcpMachineTemplateName,
-			},
-		))
-		Expect(err).ToNot(HaveOccurred(), "Failed to create CAPI MachineSet with GPU instanceType")
-
-		framework.WaitForCAPIMachinesRunning(ctx, cl, machineSet.Name)
-
-		By("Verifying the GPU machinetype configuration on the created GCP MachineTemplate")
-		createdTemplate := &gcpv1.GCPMachineTemplate{}
-		Expect(cl.Get(framework.GetContext(), client.ObjectKey{
-			Namespace: framework.ClusterAPINamespace,
-			Name:      gcpMachineTemplateName,
-		}, createdTemplate)).To(Succeed())
-		var machineType = createdTemplate.Spec.Template.Spec.InstanceType
-		Expect(machineType).To(Equal("a2-highgpu-1g"))
-	},
-	)
-	// OCP-75792 Preemptible machines can be provisioned successfully by capi machineset
-	// author: [email protected]
 	It("should provision Preemptible machine successfully", func() {
 		mapiProviderSpec := getGCPMAPIProviderSpec(cl)
 		Expect(mapiProviderSpec).ToNot(BeNil())

pkg/e2e_test.go

@@ -54,6 +54,7 @@ func init() {
 	if err := awsv1.AddToScheme(scheme.Scheme); err != nil {
 		klog.Fatal(err)
 	}
+
 	if err := gcpv1.AddToScheme(scheme.Scheme); err != nil {
 		klog.Fatal(err)
 	}