Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions test/extended/machine_config/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,18 @@ approvers:
- dkhater-redhat
- yuqi-zhang
- cheesesashimi
- umohnani8
- LorbusChris
- RishabhSaini
- isabella-janssen
- pablintino
reviewers:
- djoshy
- dkhater-redhat
- yuqi-zhang
- cheesesashimi
- umohnani8
- LorbusChris
- RishabhSaini
- isabella-janssen
- pablintino
8 changes: 4 additions & 4 deletions test/extended/machine_config/boot_image_update_agnostic.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

func AllMachineSetTest(oc *exutil.CLI, fixture string) {
// This fixture applies a boot image update configuration that opts in all machinesets
ApplyBootImageFixture(oc, fixture)
ApplyMachineConfigurationFixture(oc, fixture)

// Step through all machinesets and verify boot images are reconciled correctly.
machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
Expand All @@ -34,7 +34,7 @@ func AllMachineSetTest(oc *exutil.CLI, fixture string) {
func PartialMachineSetTest(oc *exutil.CLI, fixture string) {

// This fixture applies a boot image update configuration that opts in any machineset with the label test=boot
ApplyBootImageFixture(oc, fixture)
ApplyMachineConfigurationFixture(oc, fixture)

// Pick a random machineset to test
machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
Expand All @@ -61,7 +61,7 @@ func PartialMachineSetTest(oc *exutil.CLI, fixture string) {

func NoneMachineSetTest(oc *exutil.CLI, fixture string) {
// This fixture applies a boot image update configuration that opts in no machinesets, i.e. feature is disabled.
ApplyBootImageFixture(oc, fixture)
ApplyMachineConfigurationFixture(oc, fixture)

// Step through all machinesets and verify boot images are reconciled correctly.
machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
Expand All @@ -77,7 +77,7 @@ func NoneMachineSetTest(oc *exutil.CLI, fixture string) {
func DegradeOnOwnerRefTest(oc *exutil.CLI, fixture string) {
e2eskipper.Skipf("This test is temporarily disabled until boot image skew enforcement is implemented")
// This fixture applies a boot image update configuration that opts in all machinesets
ApplyBootImageFixture(oc, fixture)
ApplyMachineConfigurationFixture(oc, fixture)

// Pick a random machineset to test
machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/machine_config/boot_image_update_aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImagesAWS][Serial]", fun
})

g.AfterEach(func() {
ApplyBootImageFixture(oc, emptyMachineSetFixture)
ApplyMachineConfigurationFixture(oc, emptyMachineSetFixture)
})

g.It("Should update boot images only on MachineSets that are opted in [apigroup:machineconfiguration.openshift.io]", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/machine_config/boot_image_update_gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImages][Serial]", func()

g.AfterEach(func() {
// Clear out boot image configuration between tests
ApplyBootImageFixture(oc, emptyMachineSetFixture)
ApplyMachineConfigurationFixture(oc, emptyMachineSetFixture)
})

g.It("Should update boot images only on MachineSets that are opted in [apigroup:machineconfiguration.openshift.io]", func() {
Expand Down
Loading