e2e: update boot image tests

Author: djoshy

test/extended-priv/mco_bootimages.go

@@ -60,10 +60,10 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/longdurati
 
 	})
 
-	g.It("[PolarionID:81403][OTP] In BootImages Machineset should update by default", g.Label("Platform:aws", "Platform:gcp"), func() {
+	g.It("[PolarionID:81403][OTP] In BootImages Machineset should update by default", g.Label("Platform:aws", "Platform:gcp", "Platform:vsphere", "Platform:azure"), func() {
 
 		// Not supported in Vsphere
-		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform)
+		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform, VspherePlatform, AzurePlatform)
 
 		var (
 			duplicatedMachinesetName = fmt.Sprintf("cloned-tc-%s", GetCurrentTestPolarionIDNumber())
@@ -471,10 +471,10 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/longdurati
 		testUserDataUpdateFailure(oc, clonedMSName, clonedSecretName, expectedFailedMessageRegexp, setWrongIgnitionVersion)
 	})
 
-	g.It("[PolarionID:81395][OTP] Verify in boot-image by default update is opt-in", g.Label("Platform:aws", "Platform:gcp"), func() {
+	g.It("[PolarionID:81395][OTP] Verify in boot-image by default update is opt-in", g.Label("Platform:aws", "Platform:gcp", "Platform:vsphere", "Platform:azure"), func() {
 
 		// Not supported in Vsphere
-		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform)
+		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform, VspherePlatform, AzurePlatform)
 
 		exutil.By("To check the default opt-in in machieconfiguration")
 		if !strings.Contains(machineConfiguration.GetSpecOrFail(), "managedBootImages") {

test/extended-priv/mco_bootimages_skew.go

@@ -89,8 +89,8 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive
 	})
 
 	g.It("Verify Automatic mode and Upgradeable (Happy Case) [apigroup:machineconfiguration.openshift.io]", func() {
-		// only applicable on GCP, AWS clusters
-		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform)
+		// only applicable on clusters where we support automatic updates: GCP, AWS, Azure and vSphere
+		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform, AzurePlatform, VspherePlatform)
 
 		// No opinion on skew enforcement for these platforms will result in Automatic mode
 		o.Expect(machineConfiguration.RemoveSkew()).To(o.Succeed())
@@ -124,7 +124,7 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive
 	})
 
 	g.It("Verify Automatic mode and Upgradeable (Sad Case) [apigroup:machineconfiguration.openshift.io]", func(_ context.Context) {
-		// only applicable on clustres where we support automatic updates: A
+		// only applicable on clusters where we support automatic updates: GCP, AWS, Azure and vSphere
 		skipTestIfSupportedPlatformNotMatched(oc, GCPPlatform, AWSPlatform, AzurePlatform, VspherePlatform)
 
 		// No opinion on skew enforcement for these platforms will result in Automatic mode

test/extended-priv/testdata/files/machineconfigurations/skewenforcement-disabled.yaml

@@ -0,0 +1,15 @@
+apiVersion: template.openshift.io/v1
+kind: Template
+metadata:
+  name: skewenforcement-none
+objects:
+- apiVersion: operator.openshift.io/v1
+  kind: MachineConfiguration
+  metadata:
+    name: cluster
+    namespace: openshift-machine-config-operator
+  spec:
+    logLevel: Normal
+    operatorLogLevel: Normal
+    bootImageSkewEnforcement:
+      mode: None      

test/extended/boot_image_update_azure.go

@@ -21,10 +21,11 @@ import (
 var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive][Serial][OCPFeatureGate:ManagedBootImagesAzure]", g.Label("Platform:azure"), g.Ordered, func() {
 	defer g.GinkgoRecover()
 	var (
-		AllMachineSetFixture     = filepath.Join("machineconfigurations", "managedbootimages-all.yaml")
-		NoneMachineSetFixture    = filepath.Join("machineconfigurations", "managedbootimages-none.yaml")
-		PartialMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-partial.yaml")
-		EmptyMachineSetFixture   = filepath.Join("machineconfigurations", "managedbootimages-empty.yaml")
+		AllMachineSetFixture           = filepath.Join("machineconfigurations", "managedbootimages-all.yaml")
+		NoneMachineSetFixture          = filepath.Join("machineconfigurations", "managedbootimages-none.yaml")
+		PartialMachineSetFixture       = filepath.Join("machineconfigurations", "managedbootimages-partial.yaml")
+		EmptyMachineSetFixture         = filepath.Join("machineconfigurations", "managedbootimages-empty.yaml")
+		SkewEnforcementDisabledFixture = filepath.Join("machineconfigurations", "skewenforcement-disabled.yaml")
 
 		oc = exutil.NewCLI("mco-bootimage", exutil.KubeConfigPath()).AsAdmin()
 	)
@@ -36,6 +37,8 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive
 		skipUnlessFunctionalMachineAPI(oc)
 		// Skip this test on single node platforms
 		exutil.SkipOnSingleNodeTopology(oc)
+		// Disable boot image skew enforcement
+		applyMachineConfigurationFixture(oc, SkewEnforcementDisabledFixture)
 	})
 
 	g.AfterEach(func() {