Skip to content

channels/stable-4.7: Populate with 4.6.z from stable-4.6 #697

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Apr 1, 2021
Merged

channels/stable-4.7: Populate with 4.6.z from stable-4.6 #697

openshift-merge-robot merged 1 commit into from
Apr 1, 2021

Conversation

@wking
Copy link
Member

@wking wking commented Mar 16, 2021

Like 1fb8768 (#585). Id forgotten to drop 4.6.20 (and its edge to 4.7.1) from stable-4.7 when rebasing 55830fd (#675), but we're happy with the 4.6->4.7 stability, and ready to put the rest of these in stable-4.7 anyway.

@wking wking force-pushed the stable-46-to-47 branch from 6e4dec6 to 3301ab0 Compare March 16, 2021 20:36
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 16, 2021
@wking
Copy link
Member Author

wking commented Mar 16, 2021

#698 will fix:

Error: Error in channel ordering: ["Release 4.6.19 present in stable-4.7, but not in fast-4.7"]

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 16, 2021
@wking
Copy link
Member Author

wking commented Mar 16, 2021

/hold cancel

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 16, 2021
@wking
channels/stable-4.7: Populate with 4.6.z from stable-4.6
d70f010 
Like 1fb8768 (Add 4.5 to 4.6 upgrades to stable-4.6, 2020-12-14, openshift#585).
Id forgotten to drop 4.6.20 (and its edge to 4.7.1) from stable-4.7
when rebasing 55830fd (Enable 4.6.20 in stable and EUS channel(s),
2021-03-03, openshift#675), but we're happy with the 4.6->4.7 stability, and
ready to put the rest of these in stable-4.7 anyway.
@wking wking force-pushed the stable-46-to-47 branch from 3301ab0 to d70f010 Compare March 30, 2021 15:37
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2021
@LalatenduMohanty
Copy link
Member

LalatenduMohanty commented Mar 30, 2021 •
edited
Loading

/hold

Lets wait for fixes for blockers to land, see how that goes then merge this.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 30, 2021
@wking wking mentioned this pull request Apr 1, 2021
Merged
@LalatenduMohanty
Copy link
Member

LalatenduMohanty commented Apr 1, 2021

Now with https://github.com/openshift/cincinnati-graph-data/blame/master/build-suggestions/4.7.yaml#L5 we are good to merge this PR.

default:
  minor_min: 4.6.9999
  minor_max: 4.6.9999
  minor_block_list: []
  z_min: 4.7.9999
  z_max: 4.7.9999
  z_block_list: []

LalatenduMohanty
LalatenduMohanty approved these changes Apr 1, 2021
View reviewed changes
Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 1, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, wking

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 [LalatenduMohanty,wking]

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

@wking
Copy link
Member Author

wking commented Apr 1, 2021

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2021
@openshift-merge-robot openshift-merge-robot merged commit 542ca15 into openshift:master Apr 1, 2021
@wking wking deleted the stable-46-to-47 branch April 1, 2021 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

1 more reviewer

@LalatenduMohanty LalatenduMohanty LalatenduMohanty approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@LalatenduMohanty LalatenduMohanty

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@wking @LalatenduMohanty @openshift-ci-robot @openshift-merge-robot