Skip to content

NO-ISSUE: Add Capability and FeatureGate checks to OLMv1 tests #29293

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

Closed
perdasilva wants to merge 2 commits into from
Closed

NO-ISSUE: Add Capability and FeatureGate checks to OLMv1 tests #29293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51385f0
Add Capability and FeatureGate check to OLMv1 tests
tmshort Nov 12, 2024
999f940
Remove OLMv1 TechPreview check in favor of feature gate
tmshort Nov 12, 2024
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
29 changes: 17 additions & 12 deletions test/extended/olm/olmv1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ const (
typeIncompatibelOperatorsUpgradeable = "InstalledOLMOperatorsUpgradeable"
)

var _ = g.Describe("[sig-olmv1] OLMv1 CRDs", func() {
var _ = g.Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 CRDs", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLIWithoutNamespace("default")

g.It("should be installed", func(ctx g.SpecContext) {
// Check for tech preview, if this is not tech preview, bail
if !exutil.IsTechPreviewNoUpgrade(ctx, oc.AdminConfigClient()) {
g.Skip("Test only runs in tech-preview")
}
checkTestSkip(ctx, oc)

// supports multiple versions during transision
providedAPIs := []struct {
Expand Down Expand Up @@ -69,15 +67,13 @@ var _ = g.Describe("[sig-olmv1] OLMv1 CRDs", func() {
})
})

var _ = g.Describe("[sig-olmv1] OLMv1 Catalogs", func() {
var _ = g.Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 Catalogs", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLIWithoutNamespace("default")

g.It("should be installed", func(ctx g.SpecContext) {
// Check for tech preview, if this is not tech preview, bail
if !exutil.IsTechPreviewNoUpgrade(ctx, oc.AdminConfigClient()) {
g.Skip("Test only runs in tech-preview")
}
checkTestSkip(ctx, oc)

providedCatalogs := []string{
"openshift-certified-operators",
Expand All @@ -100,7 +96,7 @@ var _ = g.Describe("[sig-olmv1] OLMv1 Catalogs", func() {
})
})

var _ = g.Describe("[sig-olmv1][Serial] OLMv1 operator installation", func() {
var _ = g.Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation", func() {
defer g.GinkgoRecover()

var (
Expand Down Expand Up @@ -128,9 +124,7 @@ var _ = g.Describe("[sig-olmv1][Serial] OLMv1 operator installation", func() {
version = "3.13.0"
)
// Check for tech preview, if this is not tech preview, bail
if !exutil.IsTechPreviewNoUpgrade(ctx, oc.AdminConfigClient()) {
g.Skip("Test only runs in tech-preview")
}
checkTestSkip(ctx, oc)

ns := oc.Namespace()
g.By(fmt.Sprintf("Updating the namespace to: %q", ns))
Expand Down Expand Up @@ -249,3 +243,14 @@ func WaitForCondition(oc *exutil.CLI, status bool) (done bool, err error) {
}
return true, nil
}

func checkTestSkip(ctx context.Context, oc *exutil.CLI) {
// Hardcoded until openshift/api is updated:
// import ( configv1 "github.com/openshift/api/config/v1" )
// configv1.ClusterVersionCapabilityOperatorLifecycleManagerV1
cap, err := exutil.IsCapabilityEnabled(oc, "OperatorLifecycleManagerV1")
o.Expect(err).NotTo(o.HaveOccurred())
if !cap {
g.Skip("Test only runs with OLMv1 capability")
}
}
8 changes: 4 additions & 4 deletions test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions zz_generated.manifests/test-reporting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,14 @@ spec:
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes when primary network exist, UserDefinedNetwork
status should report not-ready'
- featureGate: NewOLM
tests:
- testName: '[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 CRDs should be installed'
- testName: '[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 Catalogs should be installed'
- testName: '[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation should
block cluster upgrades if an incompatible operator is installed'
- testName: '[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation should
install a cluster extension'
- featureGate: PersistentIPsForVirtualization
tests:
- testName: '[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][Feature:Layer2LiveMigration]
Expand Down