Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollback gocapability vendor bump #4467

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jan 11, 2021
Merged

Rollback gocapability vendor bump #4467

openshift-merge-robot merged 1 commit into from
Jan 11, 2021

Conversation

@harche
Copy link
Contributor

@harche harche commented Jan 11, 2021

Signed-off-by: Harshal Patil [email protected]

What type of PR is this?

/kind api-change
/kind bug
/kind ci
/kind cleanup
/kind dependency-change
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #4466

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

@harche harche requested review from mrunalp and runcom as code owners January 11, 2021 09:37
@openshift-ci-robot openshift-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 11, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 11, 2021

Hi @harche. Thanks for your PR.

I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

saschagrunert
saschagrunert approved these changes Jan 11, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/ok-to-test
LGTM

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 11, 2021
@harche
Copy link
Contributor Author

harche commented Jan 11, 2021

/retest

@harche
Copy link
Contributor Author

harche commented Jan 11, 2021

/test e2e-agnostic

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 11, 2021 •
edited
Loading

@harche: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-gcp 4879bba link /test e2e-gcp

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.

@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Jan 11, 2021

LGTM
Assuming happy tests

@harche
Copy link
Contributor Author

harche commented Jan 11, 2021

/test e2e-gcp

@haircommander haircommander mentioned this pull request Jan 11, 2021
Closed
@haircommander
Copy link
Member

haircommander commented Jan 11, 2021

/approve
/lgtm

thanks for tracking his down @harche

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 11, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, harche, saschagrunert

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 [haircommander,saschagrunert]

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

@haircommander
Copy link
Member

haircommander commented Jan 11, 2021 •
edited
Loading

we also got a segfault in the unit tests which may need some eyes https://app.circleci.com/pipelines/github/cri-o/cri-o/7171/workflows/25af0ac5-05b6-439d-b0db-42f2e1936b72/jobs/115965/parallel-runs/0/steps/0-107 I don't think it's related to this PR though

@openshift-merge-robot openshift-merge-robot merged commit 24807bd into cri-o:master Jan 11, 2021
@harche harche deleted the prow_fail branch January 11, 2021 15:44
@saschagrunert
Copy link
Member

saschagrunert commented Mar 15, 2021

/cherry-pick release-1.20

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 15, 2021

@saschagrunert: #4467 failed to apply on top of branch "release-1.20":

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

/cherrypick release-1.20

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-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 15, 2021

@saschagrunert: #4467 failed to apply on top of branch "release-1.20":

Applying: Rollback gocapability vendor bump
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Rollback gocapability vendor bump
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-1.20

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

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp

@runcom runcom Awaiting requested review from runcom

@rhatdan rhatdan Awaiting requested review from rhatdan

@sboeuf sboeuf Awaiting requested review from sboeuf

Assignees

@haircommander haircommander

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Kubernetes NodeConformance and NodeFeatures jobs failing with latest CRIO

7 participants

@harche @openshift-ci-robot @TomSweeneyRedHat @haircommander @saschagrunert @openshift-cherrypick-robot @openshift-merge-robot