Skip to content
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.

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

Ignore upgrade errors on vSphere HW 13 platformsupported #26533

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion test/extended/operators/operators.go
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"os"
"regexp"
"sort"
"strings"
"time"
Expand All @@ -25,6 +26,10 @@ import (
configclient "github.com/openshift/client-go/config/clientset/versioned"
)

var (
vmxPattern = regexp.MustCompile(`VSphereProblemDetectorControllerUpgradeable.+vmx-13`)
)

var _ = g.Describe("[sig-arch][Early] Managed cluster should", func() {
defer g.GinkgoRecover()

Expand Down Expand Up @@ -236,6 +241,7 @@ func surprisingConditions(co objx.Map) ([]configv1.ClusterOperatorStatusConditio
}
if cond.Get("status").String() != string(expected) {
reason := cond.Get("reason").String()
message := cond.Get("message").String()
if conditionType == configv1.OperatorUpgradeable && (name == "kube-storage-version-migrator" || // https://bugzilla.redhat.com/show_bug.cgi?id=1928141 , currently fixed for 4.10, but no backports at the moment. We currently have ...-upgrade-4.y-to-4.(y+1)-to-4.(y+2)-to-4.(y+3)-ci jobs, so as long as we don't extend that +3 skew for those jobs, we should be able to drop this code once 4.13 forks off of the development branch.
name == "openshift-controller-manager" || // https://bugzilla.redhat.com/show_bug.cgi?id=1948011 , currently fixed for 4.8, but no backports at the moment. We currently have ...-upgrade-4.y-to-4.(y+1)-to-4.(y+2)-to-4.(y+3)-ci jobs, so as long as we don't extend that +3 skew for those jobs, we should be able to drop this code once 4.10 forks off the development branch.
name == "service-ca" || // https://bugzilla.redhat.com/show_bug.cgi?id=1948012 , currently fixed for 4.8, but no backports at the moment. We currently have ...-upgrade-4.y-to-4.(y+1)-to-4.(y+2)-to-4.(y+3)-ci jobs, so as long as we don't extend that +3 skew for those jobs, we should be able to drop this code once 4.10 forks off the development branch.
Expand All @@ -255,7 +261,9 @@ func surprisingConditions(co objx.Map) ([]configv1.ClusterOperatorStatusConditio
// [1]: https://testgrid.k8s.io/redhat-openshift-ocp-release-4.10-informing#periodic-ci-openshift-release-master-nightly-4.10-upgrade-from-stable-4.8-e2e-aws-upgrade-paused
// [2]: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-release-master-nightly-4.10-upgrade-from-stable-4.8-e2e-aws-upgrade-paused/1449821870344900608
// [3]: https://github.com/openshift/cluster-kube-apiserver-operator/pull/1199
(name == "kube-apiserver" && reason == "KubeletMinorVersion_KubeletMinorVersionUnsupportedNextUpgrade")) {
(name == "kube-apiserver" && reason == "KubeletMinorVersion_KubeletMinorVersionUnsupportedNextUpgrade") ||
// https://bugzilla.redhat.com/show_bug.cgi?id=2015187
(name == "storage" && vmxPattern.MatchString(message))) {
continue
}
badConditions = append(badConditions, configv1.ClusterOperatorStatusCondition{
Expand Down