Skip to content

OCPBUGS-105399,OCPBUGS-105400: Remove TechPreview skips and event matchers from sigstore imagepolicy tests #31521

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
Aug 21, 2026
Merged

OCPBUGS-105399,OCPBUGS-105400: Remove TechPreview skips and event matchers from sigstore imagepolicy tests #31521

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
160 changes: 0 additions & 160 deletions pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_event_patterns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,18 +550,6 @@ func NewUniversalPathologicalEventMatchers(kubeConfig *rest.Config, finalInterva
vsphereConfigurationTestsRollOutTooOftenMatcher := newVsphereConfigurationTestsRollOutTooOftenEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(vsphereConfigurationTestsRollOutTooOftenMatcher)

newDeferringOperatorNodeUpdateTooOftenEventMatcher := newDeferringOperatorNodeUpdateTooOftenEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newDeferringOperatorNodeUpdateTooOftenEventMatcher)

newAnnotationChangeTooOftenEventMatcher := newAnnotationChangeTooOftenEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newAnnotationChangeTooOftenEventMatcher)

newSetDesiredConfigTooOftenEventMatcher := newSetDesiredConfigTooOftenEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newSetDesiredConfigTooOftenEventMatcher)

newCrioReloadedTooOftenEventMatcher := newCrioReloadedTooOftenEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newCrioReloadedTooOftenEventMatcher)

twoNodeEtcdEndpointsMatcher := newTwoNodeEtcdEndpointsConfigMissingEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(twoNodeEtcdEndpointsMatcher)

Expand All @@ -579,15 +567,6 @@ func NewUniversalPathologicalEventMatchers(kubeConfig *rest.Config, finalInterva
jira: "https://issues.redhat.com/browse/OCPBUGS-81340",
})

newConfigDriftMonitorStoppedTooOftenEventMatcher := newConfigDriftMonitorStoppedTooOftenEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newConfigDriftMonitorStoppedTooOftenEventMatcher)

newAddSigtermProtectionEventMatcher := newAddSigtermProtectionEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newAddSigtermProtectionEventMatcher)

newRemoveSigtermProtectionEventMatcher := newRemoveSigtermProtectionEventMatcher(finalIntervals)
registry.AddPathologicalEventMatcherOrDie(newRemoveSigtermProtectionEventMatcher)

// OVN-Kuberentes EVPN e2e tests running in parallel incorrectly create
// multiple VTEP resources with the same CIDR. No further consequence other
// than the Events themselves. Will be fixed with OCPBUGS-84917
Expand Down Expand Up @@ -1233,145 +1212,6 @@ func newSingleNodeKubeAPIProgressingEventMatcher(finalIntervals monitorapi.Inter
}
}

func newDeferringOperatorNodeUpdateTooOftenEventMatcher(finalIntervals monitorapi.Intervals) EventMatcher {
DeferringOperatorNodeUpdateIntervals := finalIntervals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "imagepolicy signature validation")
})
for i := range DeferringOperatorNodeUpdateIntervals {
DeferringOperatorNodeUpdateIntervals[i].To = DeferringOperatorNodeUpdateIntervals[i].To.Add(time.Minute * 2)
DeferringOperatorNodeUpdateIntervals[i].From = DeferringOperatorNodeUpdateIntervals[i].From.Add(time.Minute * -2)
}

return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "DeferringOperatorNodeUpdateTooOften",
messageReasonRegex: regexp.MustCompile(`^DeferringOperatorNodeUpdate$`),
jira: "https://issues.redhat.com/browse/OCPBUGS-52260",
},
allowIfWithinIntervals: DeferringOperatorNodeUpdateIntervals,
}
}

func newAnnotationChangeTooOftenEventMatcher(finalIntervals monitorapi.Intervals) EventMatcher {
AnnotationChangeIntervals := finalIntervals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "imagepolicy signature validation")
})
for i := range AnnotationChangeIntervals {
AnnotationChangeIntervals[i].To = AnnotationChangeIntervals[i].To.Add(time.Minute * 10)
AnnotationChangeIntervals[i].From = AnnotationChangeIntervals[i].From.Add(time.Minute * -10)
}

return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "AnnotationChangeTooOften",
messageReasonRegex: regexp.MustCompile(`^AnnotationChange$`),
jira: "https://issues.redhat.com/browse/OCPBUGS-58376",
},
allowIfWithinIntervals: AnnotationChangeIntervals,
}
}

func newSetDesiredConfigTooOftenEventMatcher(finalIntervals monitorapi.Intervals) EventMatcher {
SetDesiredConfigIntervals := finalIntervals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "imagepolicy signature validation")
})
for i := range SetDesiredConfigIntervals {
SetDesiredConfigIntervals[i].To = SetDesiredConfigIntervals[i].To.Add(time.Minute * 10)
SetDesiredConfigIntervals[i].From = SetDesiredConfigIntervals[i].From.Add(time.Minute * -10)
}

return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "SetDesiredConfigTooOften",
messageReasonRegex: regexp.MustCompile(`^SetDesiredConfig$`),
jira: "https://issues.redhat.com/browse/OCPBUGS-58376",
},
allowIfWithinIntervals: SetDesiredConfigIntervals,
}
}

func newCrioReloadedTooOftenEventMatcher(finalInternals monitorapi.Intervals) EventMatcher {
crioReloadedIntervals := finalInternals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "imagepolicy signature validation")
})
for i := range crioReloadedIntervals {
crioReloadedIntervals[i].To = crioReloadedIntervals[i].To.Add(time.Minute * 10)
crioReloadedIntervals[i].From = crioReloadedIntervals[i].From.Add(time.Minute * -10)
}

return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "CrioReloadedTooOften",
messageReasonRegex: regexp.MustCompile(`^ServiceReload$`),
messageHumanRegex: regexp.MustCompile(`Service crio.service was reloaded.`),
jira: "https://issues.redhat.com/browse/OCPBUGS-52260",
},
allowIfWithinIntervals: crioReloadedIntervals,
}
}

func newConfigDriftMonitorStoppedTooOftenEventMatcher(finalIntervals monitorapi.Intervals) EventMatcher {
configDriftMonitorStoppedIntervals := finalIntervals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "SigstoreImageVerification")
})
for i := range configDriftMonitorStoppedIntervals {
configDriftMonitorStoppedIntervals[i].To = configDriftMonitorStoppedIntervals[i].To.Add(time.Second * 30)
configDriftMonitorStoppedIntervals[i].From = configDriftMonitorStoppedIntervals[i].From.Add(time.Second * -30)
}

return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "ConfigDriftMonitorStoppedTooOften",
messageReasonRegex: regexp.MustCompile(`^ConfigDriftMonitorStopped$`),
jira: "https://issues.redhat.com/browse/OCPBUGS-63307",
},
allowIfWithinIntervals: configDriftMonitorStoppedIntervals,
}
}

func newAddSigtermProtectionEventMatcher(finalIntervals monitorapi.Intervals) EventMatcher {
AddSigtermProtectionIntervals := finalIntervals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "SigstoreImageVerification")
})
for i := range AddSigtermProtectionIntervals {
AddSigtermProtectionIntervals[i].To = AddSigtermProtectionIntervals[i].To.Add(time.Second * 30)
AddSigtermProtectionIntervals[i].From = AddSigtermProtectionIntervals[i].From.Add(time.Second * -30)
}
return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "AddSigtermProtection",
messageReasonRegex: regexp.MustCompile(`^AddSigtermProtection$`),
jira: "https://issues.redhat.com/browse/OCPBUGS-63307",
},
allowIfWithinIntervals: AddSigtermProtectionIntervals,
}
}

func newRemoveSigtermProtectionEventMatcher(finalIntervals monitorapi.Intervals) EventMatcher {
RemoveSigtermProtectionIntervals := finalIntervals.Filter(func(eventInterval monitorapi.Interval) bool {
return eventInterval.Source == monitorapi.SourceE2ETest &&
strings.Contains(eventInterval.Locator.Keys[monitorapi.LocatorE2ETestKey], "SigstoreImageVerification")
})
for i := range RemoveSigtermProtectionIntervals {
RemoveSigtermProtectionIntervals[i].To = RemoveSigtermProtectionIntervals[i].To.Add(time.Second * 30)
RemoveSigtermProtectionIntervals[i].From = RemoveSigtermProtectionIntervals[i].From.Add(time.Second * -30)
}
return &OverlapOtherIntervalsPathologicalEventMatcher{
delegate: &SimplePathologicalEventMatcher{
name: "RemoveSigtermProtection",
messageReasonRegex: regexp.MustCompile(`^RemoveSigtermProtection$`),
jira: "https://issues.redhat.com/browse/OCPBUGS-63307",
},
allowIfWithinIntervals: RemoveSigtermProtectionIntervals,
}
}

// kmsEncryptionTestsDetected returns true if OCP KMS encryption tests are
// present in the given intervals. It matches the [OCPFeatureGate:KMSEncryption]
// tag to avoid catching upstream KMS tests that don't trigger the same
Expand Down
9 changes: 0 additions & 9 deletions test/extended/imagepolicy/imagepolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ var _ = g.Describe("[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Di
)

g.BeforeAll(func() {
if !exutil.IsTechPreviewNoUpgrade(tctx, oc.AdminConfigClient()) {
g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")
}
// skip test on disconnected clusters.
networkConfig, err := oc.AdminConfigClient().ConfigV1().Networks().Get(context.Background(), "cluster", metav1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -164,12 +161,6 @@ var _ = g.Describe("[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Di
testImagePolicies = generateImagePolicies()
)

g.BeforeAll(func() {
if !exutil.IsTechPreviewNoUpgrade(tctx, oc.AdminConfigClient()) {
g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")
}
})

g.DescribeTable("clusterimagepolicy signature validation tests",
func(policyName string, expectPass bool, imageSpec string, verifyFunc func(tctx context.Context, clif *e2e.Framework, expectPass bool, testPodName string, imageSpec string) error) {
createClusterImagePolicy(oc, testClusterImagePolicies[policyName])
Expand Down