Skip to content

fix broken CI test#14163

Merged
openshift-merge-robot merged 1 commit intocontainers:mainfrom
Luap99:fix-14162
May 9, 2022
Merged

fix broken CI test#14163
openshift-merge-robot merged 1 commit intocontainers:mainfrom
Luap99:fix-14162

Conversation

@Luap99
Copy link
Copy Markdown
Member

@Luap99 Luap99 commented May 9, 2022

Commit b58e7e7 was not fully rebased before merging and is now
breaking CI because commit 69c479b made the underlying error
visible. Using journald inside the container tests is not supported.

Fixes #14162

Does this PR introduce a user-facing change?

None

Commit b58e7e7 was not fully rebased before merging and is now
breaking CI because commit 69c479b made the underlying error
visible. Using journald inside the container tests is not supported.

Fixes containers#14162

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented May 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

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:

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 May 9, 2022
@mheon
Copy link
Copy Markdown
Member

mheon commented May 9, 2022

LGTM

@edsantiago
Copy link
Copy Markdown
Member

/lgtm
/hold

Thank you @Luap99

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 9, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 9, 2022
@edsantiago edsantiago removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 9, 2022
@openshift-merge-robot openshift-merge-robot merged commit 68e4555 into containers:main May 9, 2022
@Luap99 Luap99 deleted the fix-14162 branch May 9, 2022 18:40
@mheon
Copy link
Copy Markdown
Member

mheon commented Jun 9, 2022

Let's see how this works, given I am still in the process of cherry picking the commit this is based on

/cherry-pick v4.1

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@mheon: #14163 failed to apply on top of branch "v4.1":

Applying: fix broken CI test
Using index info to reconstruct a base tree...
M	test/e2e/play_kube_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/play_kube_test.go
CONFLICT (content): Merge conflict in test/e2e/play_kube_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix broken CI test
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:

Let's see how this works, given I am still in the process of cherry picking the commit this is based on

/cherry-pick v4.1

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.

@mheon
Copy link
Copy Markdown
Member

mheon commented Jun 9, 2022

Ah, lovely.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CI broken: failed to initialize journal: write unixgram

5 participants