Skip to content

🌱 OPRUN-4784: Move ClusterExtension E2E steps into operator-controller #3150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Nov 11, 2026
Merged

🌱 OPRUN-4784: Move ClusterExtension E2E steps into operator-controller #3150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions test/e2e/catalogd/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/operator-framework/operator-controller/test/internal/e2e"
catalogsteps "github.com/operator-framework/operator-controller/test/internal/e2e/catalogd/steps"
operatorsteps "github.com/operator-framework/operator-controller/test/internal/e2e/operator-controller/steps"
"github.com/operator-framework/operator-controller/test/internal/e2e/steps"
)

Expand All @@ -17,6 +18,7 @@ func TestMain(m *testing.M) {
}, func(sc *godog.ScenarioContext) {
steps.RegisterSteps(sc)
catalogsteps.RegisterSteps(sc)
operatorsteps.RegisterSteps(sc)
catalogsteps.RegisterHooks(sc)
steps.RegisterHooks(sc)
}))
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/features_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/operator-framework/operator-controller/test/internal/e2e"
catalogsteps "github.com/operator-framework/operator-controller/test/internal/e2e/catalogd/steps"
operatorsteps "github.com/operator-framework/operator-controller/test/internal/e2e/operator-controller/steps"
platformsteps "github.com/operator-framework/operator-controller/test/internal/e2e/platform/steps"
"github.com/operator-framework/operator-controller/test/internal/e2e/steps"
)
Expand Down Expand Up @@ -44,6 +45,7 @@ func TestMain(m *testing.M) {
}, func(sc *godog.ScenarioContext) {
steps.RegisterSteps(sc)
catalogsteps.RegisterSteps(sc)
operatorsteps.RegisterSteps(sc)
platformsteps.RegisterDemoSteps(sc)
catalogsteps.RegisterHooks(sc)
steps.RegisterHooks(sc, platformsteps.RegisterAsciiCastHooks)
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/object-controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/cucumber/godog"

"github.com/operator-framework/operator-controller/test/internal/e2e"
operatorsteps "github.com/operator-framework/operator-controller/test/internal/e2e/operator-controller/steps"
"github.com/operator-framework/operator-controller/test/internal/e2e/steps"
)

Expand All @@ -15,6 +16,7 @@ func TestMain(m *testing.M) {
tc.BeforeSuite(steps.BeforeSuite)
}, func(sc *godog.ScenarioContext) {
steps.RegisterSteps(sc)
operatorsteps.RegisterSteps(sc)
steps.RegisterHooks(sc)
}))
}
2 changes: 2 additions & 0 deletions test/e2e/operator-controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/cucumber/godog"

"github.com/operator-framework/operator-controller/test/internal/e2e"
operatorsteps "github.com/operator-framework/operator-controller/test/internal/e2e/operator-controller/steps"
"github.com/operator-framework/operator-controller/test/internal/e2e/steps"
)

Expand All @@ -15,6 +16,7 @@ func TestMain(m *testing.M) {
tc.BeforeSuite(steps.BeforeSuite)
}, func(sc *godog.ScenarioContext) {
steps.RegisterSteps(sc)
operatorsteps.RegisterSteps(sc)
steps.RegisterHooks(sc)
}))
}
2 changes: 2 additions & 0 deletions test/e2e/platform/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/cucumber/godog"

"github.com/operator-framework/operator-controller/test/internal/e2e"
operatorsteps "github.com/operator-framework/operator-controller/test/internal/e2e/operator-controller/steps"
platformsteps "github.com/operator-framework/operator-controller/test/internal/e2e/platform/steps"
"github.com/operator-framework/operator-controller/test/internal/e2e/steps"
)
Expand All @@ -16,6 +17,7 @@ func TestMain(m *testing.M) {
tc.BeforeSuite(steps.BeforeSuite)
}, func(sc *godog.ScenarioContext) {
steps.RegisterSteps(sc)
operatorsteps.RegisterSteps(sc)
platformsteps.RegisterDemoSteps(sc)
steps.RegisterHooks(sc, platformsteps.RegisterAsciiCastHooks)
}))
Expand Down
575 changes: 575 additions & 0 deletions test/internal/e2e/operator-controller/steps/steps.go
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions test/internal/e2e/steps/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,6 @@ type World struct {
LastApplyStderr string
}

// GatherClusterExtensionObjects collects all resources related to the ClusterExtension container in
// either their Helm release Secret or ClusterObjectSet depending on the applier being used
// and saves them into the context.
func (s *World) GatherClusterExtensionObjects() error {
objs, err := listExtensionResources(s.ClusterExtensionName)
if err != nil {
return fmt.Errorf("failed to load extension resources into context: %w", err)
}
s.ExtensionObjects = objs
return nil
}

// GetClusterExtensionObjects returns the ClusterExtension objects currently saved into the context.
// Will always return nil until GatherClusterExtensionObjects is called
func (s *World) GetClusterExtensionObjects() []client.Object {
return s.ExtensionObjects
}

type contextKey string

const (
Expand Down
546 changes: 0 additions & 546 deletions test/internal/e2e/steps/steps.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions test/upgrade-e2e/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/cucumber/godog/colors"
"github.com/spf13/pflag"

operatorsteps "github.com/operator-framework/operator-controller/test/internal/e2e/operator-controller/steps"
"github.com/operator-framework/operator-controller/test/internal/e2e/steps"
)

Expand All @@ -33,6 +34,7 @@ func TestMain(m *testing.M) {
ScenarioInitializer: func(sc *godog.ScenarioContext) {
sc.Before(steps.CreateScenarioContext)
steps.RegisterSteps(sc)
operatorsteps.RegisterSteps(sc)
},
Options: &opts,
}.Run()
Expand Down
Loading