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

Unblocking CI selinux dependencies #1705

Merged
merged 3 commits into from
Apr 24, 2023

Conversation

copejon
Copy link
Contributor

@copejon copejon commented Apr 24, 2023

Which issue(s) this PR addresses:

USHIFT-1122

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 24, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2023
Signed-off-by: Jon Cope <jcope@redhat.com>
Signed-off-by: Jon Cope <jcope@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2023

@copejon: 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.

@dhellmann
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@copejon copejon changed the title [WIP] Unblocking CI selinux dependencies Unblocking CI selinux dependencies Apr 24, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 24, 2023
@openshift-ci openshift-ci bot merged commit 1f32f44 into openshift:main Apr 24, 2023
@copejon copejon deleted the set-max-ctr-selinux-ver branch April 24, 2023 20:05
@copejon
Copy link
Contributor Author

copejon commented Apr 24, 2023

/cherry-pick release-4.13

@openshift-cherrypick-robot

@copejon: new pull request created: #1706

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.

@copejon
Copy link
Contributor Author

copejon commented Apr 24, 2023

/cherry-pick release-4.14

@openshift-cherrypick-robot

@copejon: #1705 failed to apply on top of branch "release-4.14":

Applying: set max container-selinux version
Using index info to reconstruct a base tree...
M	packaging/rpm/microshift.spec
Falling back to patching base and 3-way merge...
Auto-merging packaging/rpm/microshift.spec
CONFLICT (content): Merge conflict in packaging/rpm/microshift.spec
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 set max container-selinux version
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.

@copejon copejon restored the set-max-ctr-selinux-ver branch April 24, 2023 23:38
@copejon
Copy link
Contributor Author

copejon commented Apr 24, 2023

/cherry-pick release-4.14

@openshift-cherrypick-robot

@copejon: #1705 failed to apply on top of branch "release-4.14":

Applying: set max container-selinux version
Using index info to reconstruct a base tree...
M	packaging/rpm/microshift.spec
Falling back to patching base and 3-way merge...
Auto-merging packaging/rpm/microshift.spec
CONFLICT (content): Merge conflict in packaging/rpm/microshift.spec
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 set max container-selinux version
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.

@copejon copejon deleted the set-max-ctr-selinux-ver branch July 26, 2023 21:41
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. 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