Skip to content

USHIFT-290: update ovn-kubernetes to rhel9 based image#1517

Merged
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
zshi-redhat:USHIFT-290
Mar 20, 2023
Merged

USHIFT-290: update ovn-kubernetes to rhel9 based image#1517
openshift-merge-robot merged 1 commit intoopenshift:mainfrom
zshi-redhat:USHIFT-290

Conversation

@zshi-redhat
Copy link
Copy Markdown
Contributor

No description provided.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 17, 2023

@zshi-redhat: This pull request references USHIFT-290 which is a valid jira issue.

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 kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 17, 2023
@openshift-ci openshift-ci Bot requested review from fzdarsky and stlaz March 17, 2023 03:33
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2023
@zshi-redhat
Copy link
Copy Markdown
Contributor Author

/cc @pmtk

@openshift-ci openshift-ci Bot requested a review from pmtk March 17, 2023 03:34
@ggiguash
Copy link
Copy Markdown
Contributor

/retest

3 similar comments
@zshi-redhat
Copy link
Copy Markdown
Contributor Author

/retest

@zshi-redhat
Copy link
Copy Markdown
Contributor Author

/retest

@zshi-redhat
Copy link
Copy Markdown
Contributor Author

/retest

Signed-off-by: Zenghui Shi <zshi@redhat.com>
@zshi-redhat
Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 20, 2023

@zshi-redhat: 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/test-infra repository. I understand the commands that are listed here.

@ggiguash
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, zshi-redhat

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 [ggiguash,zshi-redhat]

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

@openshift-merge-robot openshift-merge-robot merged commit 40e32ca into openshift:main Mar 20, 2023
@zshi-redhat
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link
Copy Markdown

@zshi-redhat: #1517 failed to apply on top of branch "release-4.13":

Applying: Update ovn-kubernetes to rhel9 based image
Using index info to reconstruct a base tree...
M	assets/release/release-aarch64.json
M	assets/release/release-x86_64.json
M	scripts/auto-rebase/rebase.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/auto-rebase/rebase.sh
Auto-merging assets/release/release-x86_64.json
CONFLICT (content): Merge conflict in assets/release/release-x86_64.json
Auto-merging assets/release/release-aarch64.json
CONFLICT (content): Merge conflict in assets/release/release-aarch64.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update ovn-kubernetes to rhel9 based image
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.13

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/test-infra repository.

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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants