Skip to content

Commit 1a3bcbf

Browse files
committed
e2e: disable skew enforcement for boot image tests
1 parent a2e9dab commit 1a3bcbf

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: template.openshift.io/v1
2+
kind: Template
3+
metadata:
4+
name: skewenforcement-none
5+
objects:
6+
- apiVersion: operator.openshift.io/v1
7+
kind: MachineConfiguration
8+
metadata:
9+
name: cluster
10+
namespace: openshift-machine-config-operator
11+
spec:
12+
logLevel: Normal
13+
operatorLogLevel: Normal
14+
bootImageSkewEnforcement:
15+
mode: None
16+

test/extended/boot_image_update_azure.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ import (
2121
var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive][Serial][OCPFeatureGate:ManagedBootImagesAzure]", g.Label("Platform:azure"), g.Ordered, func() {
2222
defer g.GinkgoRecover()
2323
var (
24-
AllMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-all.yaml")
25-
NoneMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-none.yaml")
26-
PartialMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-partial.yaml")
27-
EmptyMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-empty.yaml")
24+
AllMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-all.yaml")
25+
NoneMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-none.yaml")
26+
PartialMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-partial.yaml")
27+
EmptyMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-empty.yaml")
28+
SkewEnforcementDisabledFixture = filepath.Join("machineconfigurations", "skewnforcement-disabled.yaml")
2829

2930
oc = exutil.NewCLI("mco-bootimage", exutil.KubeConfigPath()).AsAdmin()
3031
)
@@ -36,6 +37,8 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive
3637
skipUnlessFunctionalMachineAPI(oc)
3738
// Skip this test on single node platforms
3839
skipOnSingleNodeTopology(oc)
40+
// Disable boot image skew enforcement
41+
applyMachineConfigurationFixture(oc, SkewEnforcementDisabledFixture)
3942
})
4043

4144
g.AfterEach(func() {

0 commit comments

Comments
 (0)