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

[release-4.15] USHIFT-2157: Stop using copr repos as a source of osbuild RPM packages #2928

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #2927

/assign ggiguash

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 24, 2024

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: USHIFT-2157

In response to this:

This is an automated cherry-pick of #2927

/assign ggiguash

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.

@ggiguash
Copy link
Contributor

/retest-required

Copy link
Contributor

openshift-ci bot commented Jan 25, 2024

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

@ggiguash
Copy link
Contributor

/lgtm
/label backport-risk-assessed
/label jira/valid-bug

@openshift-ci openshift-ci bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 25, 2024
@ggiguash
Copy link
Contributor

/approved
/label cherry-pick-approved

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jan 25, 2024
@ggiguash
Copy link
Contributor

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link
Author

@ggiguash: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

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.

Copy link
Contributor

openshift-ci bot commented Jan 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, openshift-cherrypick-robot

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 52fc38e into openshift:release-4.15 Jan 25, 2024
8 checks passed
@openshift-cherrypick-robot
Copy link
Author

@ggiguash: #2928 failed to apply on top of branch "release-4.14":

Applying: Stop using copr repos as a source of osbuild RPM packages
Using index info to reconstruct a base tree...
M	scripts/image-builder/configure.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/image-builder/configure.sh
CONFLICT (content): Merge conflict in scripts/image-builder/configure.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Stop using copr repos as a source of osbuild RPM packages
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".

In response to this:

/cherry-pick release-4.14

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants