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

OCPBUGS-35462: shiftstack: add CPO rebase for 4.16 and update the master one #53206

Merged
merged 1 commit into from
Jun 14, 2024

Conversation

EmilienM
Copy link
Member

  • master: bump CPO to upstream release-1.30, this is necessary to get
    the k8s 1.30 + deps, like we have in OCP 4.17 already.
  • 4.16: create the rebase and use upstream release-1.29 which is the
    release of k8s in OCP 4.16.

…ter one

* master: bump CPO to upstream release-1.30, this is necessary to get
  the k8s 1.30 + deps, like we have in OCP 4.17 already.
* 4.16: create the rebase and use upstream release-1.29 which is the
  release of k8s in OCP 4.16.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 13, 2024
@openshift-ci-robot
Copy link
Contributor

@EmilienM: This pull request references Jira Issue OCPBUGS-35462, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

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.

In response to this:

  • master: bump CPO to upstream release-1.30, this is necessary to get
    the k8s 1.30 + deps, like we have in OCP 4.17 already.
  • 4.16: create the rebase and use upstream release-1.29 which is the
    release of k8s in OCP 4.16.

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.

@EmilienM
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@EmilienM: This pull request references Jira Issue OCPBUGS-35462, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

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.

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.

@EmilienM
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@EmilienM: This pull request references Jira Issue OCPBUGS-35462, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

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.

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.

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@EmilienM: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-shiftstack-merge-bot-main-cloud-provider-openstack-master N/A periodic Ci-operator config changed
periodic-ci-shiftstack-merge-bot-main-cloud-provider-openstack-4-16 N/A periodic Periodic changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@EmilienM
Copy link
Member Author

/pj-rehearse ack

@openshift-ci-robot
Copy link
Contributor

@EmilienM: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 13, 2024
@EmilienM
Copy link
Member Author

/jira refresh

@openshift-ci-robot 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 Jun 13, 2024
@openshift-ci-robot
Copy link
Contributor

@EmilienM: This pull request references Jira Issue OCPBUGS-35462, 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.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@redhat.com), skipping review request.

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.

@EmilienM
Copy link
Member Author

/cc mandre

@openshift-ci openshift-ci bot requested review from mandre and mdbooth June 13, 2024 21:22
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 13, 2024
@pierreprinetti
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 14, 2024
Copy link
Contributor

openshift-ci bot commented Jun 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, pierreprinetti

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

Copy link
Contributor

openshift-ci bot commented Jun 14, 2024

@EmilienM: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 9de4cd2 into openshift:master Jun 14, 2024
17 checks passed
@openshift-ci-robot
Copy link
Contributor

@EmilienM: Jira Issue OCPBUGS-35462: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-35462 has been moved to the MODIFIED state.

In response to this:

  • master: bump CPO to upstream release-1.30, this is necessary to get
    the k8s 1.30 + deps, like we have in OCP 4.17 already.
  • 4.16: create the rebase and use upstream release-1.29 which is the
    release of k8s in OCP 4.16.

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.

lihongyan1 pushed a commit to lihongyan1/release that referenced this pull request Jun 20, 2024
…ter one (openshift#53206)

* master: bump CPO to upstream release-1.30, this is necessary to get
  the k8s 1.30 + deps, like we have in OCP 4.17 already.
* 4.16: create the rebase and use upstream release-1.29 which is the
  release of k8s in OCP 4.16.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants