Skip to content

Commit ebc0b4b

Browse files
authored
Merge branch 'openshift:main' into update-tests-to-dotnet-8
2 parents 2bbe035 + 367ab40 commit ebc0b4b

File tree

3,460 files changed

+571360
-391182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,460 files changed

+571360
-391182
lines changed

go.mod

Lines changed: 127 additions & 127 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 248 additions & 236 deletions
Large diffs are not rendered by default.

images/tests/Dockerfile.rhel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ RUN PACKAGES="git gzip util-linux" && \
2020
LABEL io.k8s.display-name="OpenShift End-to-End Tests" \
2121
io.openshift.release.operator=true \
2222
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
23-
io.openshift.build.versions="kubernetes-tests=1.33.4" \
23+
io.openshift.build.versions="kubernetes-tests=1.34.1" \
2424
io.openshift.tags="openshift,tests,e2e"

pkg/defaultmonitortests/types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/openshift/origin/pkg/monitortests/authentication/requiredsccmonitortests"
99
admupgradestatus "github.com/openshift/origin/pkg/monitortests/cli/adm_upgrade/status"
1010
azuremetrics "github.com/openshift/origin/pkg/monitortests/cloud/azure/metrics"
11+
"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/clusterversionchecker"
1112
"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/legacycvomonitortests"
1213
"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/operatorstateanalyzer"
1314
"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/terminationmessagepolicy"
@@ -173,6 +174,7 @@ func newUniversalMonitorTests(info monitortestframework.MonitorTestInitializatio
173174
monitorTestRegistry.AddMonitorTestOrDie("termination-message-policy", "Cluster Version Operator", terminationmessagepolicy.NewAnalyzer())
174175
monitorTestRegistry.AddMonitorTestOrDie("operator-state-analyzer", "Cluster Version Operator", operatorstateanalyzer.NewAnalyzer())
175176
monitorTestRegistry.AddMonitorTestOrDie("required-scc-annotation-checker", "Cluster Version Operator", requiredsccmonitortests.NewAnalyzer())
177+
monitorTestRegistry.AddMonitorTestOrDie("cluster-version-checker", "Cluster Version Operator", clusterversionchecker.NewClusterVersionChecker())
176178

177179
monitorTestRegistry.AddMonitorTestOrDie("etcd-log-analyzer", "etcd", etcdloganalyzer.NewEtcdLogAnalyzer())
178180
monitorTestRegistry.AddMonitorTestOrDie("legacy-etcd-invariants", "etcd", legacyetcdmonitortests.NewLegacyTests())

0 commit comments

Comments
 (0)