Skip to content

OPRUN-4407: automate OCP-87276 #1212

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

Open
Xia-Zhao-rh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OPRUN-4407: automate OCP-87276 #1212

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
25 changes: 20 additions & 5 deletions tests-extension/test/qe/specs/olmv0_defaultoption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,20 +2015,35 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 optional should", func() {
sub.ApproveSpecificIP(oc, itName, dr, "etcdoperator.v0.9.2", "Complete")
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", "etcdoperator.v0.9.2", "-n", oc.Namespace(), "-o=jsonpath={.status.phase}"}).Check(oc)

// Get current OCP version for later checks
currentVersion, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("clusterversion", "version", "-o=jsonpath={.status.desired.version}").Output()
if err != nil {
e2e.Failf("Fail to get the OCP version")
}
v, _ := semver.ParseTolerant(currentVersion)

// olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": " "}]'
g.By("5, this operator's olm.maxOpenShiftVersion is empty, so it should block the upgrade")
olmv0util.CheckUpgradeStatus(oc, "False")
// [OCP-87276] For OCP 4.22, check the Upgradeable message contains specific error about parsing failure
// Use Major.Minor comparison to handle nightly/prerelease versions correctly
if v.Major == 4 && v.Minor == 22 {
g.By("5-1, [OCP-87276] OCP 4.22: check message contains 'upgrades to 4.23' and parsing error")
olmv0util.CheckUpgradeMessage(oc, "upgrades to 4.23 or major version upgrades to 5.0")
olmv0util.CheckUpgradeMessage(oc, "has invalid olm.maxOpenShiftVersion properties")
}

g.By("6, apprrove this etcdoperator.v0.9.4, it should be in Complete state")
sub.ApproveSpecificIP(oc, itName, dr, "etcdoperator.v0.9.4", "Complete")
olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Compare, "Succeeded", exutil.Ok, []string{"csv", "etcdoperator.v0.9.4", "-n", oc.Namespace(), "-o=jsonpath={.status.phase}"}).Check(oc)
// [OCP-87276] For OCP 4.22, check the Upgradeable message after upgrading to v0.9.4 (maxOpenShiftVersion: 4.9)
if v.Major == 4 && v.Minor == 22 {
g.By("6-1, [OCP-87276] OCP 4.22: check message contains 'upgrades to 4.23' and 'maximum supported OCP version'")
olmv0util.CheckUpgradeMessage(oc, "upgrades to 4.23 or major version upgrades to 5.0")
olmv0util.CheckUpgradeMessage(oc, "maximum supported OCP version")
}
// olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]'
g.By("7, 4.9.0-xxx upgraded to 4.10.0-xxx < 4.10.0, or 4.9.1 upgraded to 4.9.x < 4.10.0, so it should NOT block 4.9 upgrade, but block 4.10+ upgrade")
currentVersion, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("clusterversion", "version", "-o=jsonpath={.status.desired.version}").Output()
if err != nil {
e2e.Failf("Fail to get the OCP version")
}
v, _ := semver.ParseTolerant(currentVersion)
maxVersion, _ := semver.ParseTolerant("4.9")
// current version > the operator's max version: 4.9
if v.Compare(maxVersion) > 0 {
Expand Down
20 changes: 20 additions & 0 deletions tests-extension/test/qe/util/olmv0util/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,26 @@ func CheckUpgradeStatus(oc *exutil.CLI, expectedStatus string) {
exutil.AssertWaitPollNoErr(err, fmt.Sprintf("Upgradeable status of the OLM %s is not expected", expectedStatus))
}

// CheckUpgradeMessage checks the Upgradeable message contains expected text
func CheckUpgradeMessage(oc *exutil.CLI, expectedMessageSubstring string) {
e2e.Logf("Check the Upgradeable message of the OLM, expected message to contain: %s", expectedMessageSubstring)
err := wait.PollUntilContextTimeout(context.TODO(), 3*time.Second, 60*time.Second, false, func(ctx context.Context) (bool, error) {
message, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("co", "operator-lifecycle-manager", "-o=jsonpath={.status.conditions[?(@.type==\"Upgradeable\")].message}").Output()
if err != nil {
e2e.Failf("Fail to get the Upgradeable message of the OLM: %v", err)
}

if !strings.Contains(message, expectedMessageSubstring) {
e2e.Logf("Expected message to contain '%s', but got: %s", expectedMessageSubstring, message)
return false, nil
}

e2e.Logf("The Upgradeable message contains expected text: %s", expectedMessageSubstring)
return true, nil
})
exutil.AssertWaitPollNoErr(err, fmt.Sprintf("Upgradeable message doesn't contain expected text: %s", expectedMessageSubstring))
}

func notInList(target string, strArray []string) bool {
for _, element := range strArray {
if target == element {
Expand Down