OCPBUGS-71234: Permit z-stream upgrades when custom featureGates are enabled #6083

copejon · 2026-01-14T21:53:20Z

No description provided.

… upgrades add unit test for upgrade validation

openshift-ci-robot · 2026-01-14T21:53:26Z

@copejon: This pull request references Jira Issue OCPBUGS-71234, which is invalid:

expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.21.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

agullon · 2026-01-15T11:05:30Z

pkg/admin/prerun/featuregate_lock.go

-			"4. Restart MicroShift: sudo systemctl restart microshift",
+			"- Roll back MicroShift to version %s, OR\n"+
+			"- Run: sudo microshift-cleanup-data --all\n"+
+			"  and remove custom feature gates from /etc/microshift/config.yaml before restarting MicroShift.",


I prefer previous version of instruction with number points. From my point of view it's more readable.

agullon · 2026-01-15T11:11:44Z

pkg/admin/prerun/featuregate_lock_test.go

+			lockFileVer: versionMetadata{Major: 5, Minor: 0, Patch: 0},
+			currentVer:  versionMetadata{Major: 4, Minor: 18, Patch: 0},
+			wantErr:     true,
+			description: "Major version downgrade (5.0.0 -> 4.18.0) should be blocked",


I don't know if I've understood this change correctly but these unit tests seems to be wrong or at least misleading because FeatureSet feature does not exist before 4.21 so I wouldn't use versions previous like 4.18 or 4.19. Also, I don't think we should test downgrade paths because they are not supported.

Makes sense. The values themselves are unimportant so long as they represent different upgrade scenarios.

copejon · 2026-01-16T00:05:24Z

Pausing until we have a decision on MicroShift supporting specific tech-preview features

/hold

… clarity

copejon · 2026-01-19T18:46:27Z

/unhold

pkg/admin/prerun/featuregate_lock_test.go

Co-authored-by: Alejandro Gullón <agullon@redhat.com>

copejon · 2026-01-21T21:32:19Z

/test e2e-aws-tests-bootc-arm

openshift-ci · 2026-01-21T22:54:27Z

@copejon: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

copejon

/jira refresh

copejon · 2026-01-19T18:46:12Z

pkg/admin/prerun/featuregate_lock.go

-			"4. Restart MicroShift: sudo systemctl restart microshift",
+			"- Roll back MicroShift to version %s, OR\n"+
+			"- Run: sudo microshift-cleanup-data --all\n"+
+			"  and remove custom feature gates from /etc/microshift/config.yaml before restarting MicroShift.",


agullon · 2026-01-27T09:52:05Z

it looks good to me

pmtk · 2026-01-27T15:36:31Z

/lgtm

openshift-ci · 2026-01-27T15:37:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: copejon, pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [copejon,pmtk]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

copejon · 2026-01-27T17:12:58Z

/jira refresh

openshift-ci-robot · 2026-01-27T17:13:03Z

@copejon: This pull request references Jira Issue OCPBUGS-71234, which is invalid:

expected the bug to target the "4.22.0" version, but no target version was set
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

copejon · 2026-01-27T17:15:26Z

/jira refresh

openshift-ci-robot · 2026-01-27T17:15:31Z

@copejon: This pull request references Jira Issue OCPBUGS-71234, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

copejon · 2026-01-27T17:29:44Z

/jira refresh

openshift-ci-robot · 2026-01-27T17:29:50Z

@copejon: This pull request references Jira Issue OCPBUGS-71234, which is invalid:

expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.21" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

copejon · 2026-01-27T17:32:16Z

/jira refresh

openshift-ci-robot · 2026-01-27T17:32:26Z

@copejon: This pull request references Jira Issue OCPBUGS-71234, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jogeo

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

copejon · 2026-01-27T21:39:36Z

/verified by jcope,ci

openshift-ci-robot · 2026-01-27T21:39:50Z

@copejon: This PR has been marked as verified by jcope,ci.

Details

In response to this:

/verified by jcope,ci

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-01-27T23:26:50Z

@copejon: Jira Issue OCPBUGS-71234: All pull requests linked via external trackers have merged:

openshift/microshift#6083

All linked pull requests have the verified tag. Jira Issue OCPBUGS-71234 has been moved to the VERIFIED state.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

agullon · 2026-01-28T11:09:55Z

/cherrypick release-4.21

openshift-cherrypick-robot · 2026-01-28T11:11:51Z

@agullon: new pull request created: #6161

Details

In response to this:

/cherrypick release-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-cherrypick-robot · 2026-01-29T15:10:01Z

@copejon: new pull request could not be created: failed to create pull request against openshift/microshift#release-4.21 from head openshift-cherrypick-robot:cherry-pick-6083-to-release-4.21: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-6083-to-release-4.21."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

Details

In response to this:

/cherrypick release-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

align featuregate upgrade blocking behavior by allowing only z-stream…

356938f

… upgrades add unit test for upgrade validation

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 14, 2026

openshift-ci bot requested review from agullon and kasturinarra January 14, 2026 21:53

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 14, 2026

agullon reviewed Jan 15, 2026

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 16, 2026

revert logged instructions; tests now use minor version 21 and up for…

a7668d1

… clarity

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 19, 2026

agullon reviewed Jan 20, 2026

View reviewed changes

pkg/admin/prerun/featuregate_lock_test.go Outdated Show resolved Hide resolved

agullon reviewed Jan 20, 2026

View reviewed changes

pkg/admin/prerun/featuregate_lock_test.go Outdated Show resolved Hide resolved

Apply suggestions from code review

e67c096

Co-authored-by: Alejandro Gullón <agullon@redhat.com>

copejon commented Jan 23, 2026

View reviewed changes

openshift-ci bot assigned pmtk Jan 27, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 27, 2026

openshift-ci bot requested a review from jogeo January 27, 2026 17:32

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 27, 2026

openshift-merge-bot bot merged commit 476e1af into openshift:main Jan 27, 2026
12 checks passed

openshift-cherrypick-robot mentioned this pull request Jan 28, 2026

[release-4.21] OCPBUGS-74574: Permit z-stream upgrades when custom featureGates are enabled #6161

Open

OCPBUGS-71234: Permit z-stream upgrades when custom featureGates are enabled #6083

OCPBUGS-71234: Permit z-stream upgrades when custom featureGates are enabled #6083

Uh oh!

Conversation

copejon commented Jan 14, 2026

Uh oh!

openshift-ci-robot commented Jan 14, 2026

Uh oh!

agullon Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

copejon Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

agullon Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

copejon Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

copejon commented Jan 16, 2026

Uh oh!

copejon commented Jan 19, 2026

Uh oh!

Uh oh!

Uh oh!

copejon commented Jan 21, 2026

Uh oh!

openshift-ci bot commented Jan 21, 2026

Uh oh!

copejon left a comment

Choose a reason for hiding this comment

Uh oh!

copejon Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

agullon commented Jan 27, 2026

Uh oh!

pmtk commented Jan 27, 2026

Uh oh!

openshift-ci bot commented Jan 27, 2026

Uh oh!

copejon commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

copejon commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

copejon commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

copejon commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

copejon commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

agullon commented Jan 28, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 28, 2026

Uh oh!

openshift-cherrypick-robot commented Jan 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants