Skip to content

UPSTREAM: 44625: Retry secret reference addition on conflict #13804

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

Closed
wants to merge 1 commit into from
Closed

UPSTREAM: 44625: Retry secret reference addition on conflict #13804

wants to merge 1 commit into from

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Apr 18, 2017

also includes test fixes from 44996 and 45151

@liggitt
Copy link
Contributor Author

liggitt commented Apr 18, 2017

[test]

@mfojtik
Copy link
Contributor

mfojtik commented Apr 19, 2017

[test]

flake: #12072

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 27, 2017
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 30, 2017
@deads2k
Copy link
Contributor

deads2k commented May 3, 2017

[merge]

@deads2k deads2k added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 4, 2017
@deads2k
Copy link
Contributor

deads2k commented May 4, 2017

Bug fix that prevents flakes.

@deads2k
Copy link
Contributor

deads2k commented May 4, 2017

@liggitt Since we don't always clean anymore, I guess we can race and get an extra. That test-cmd test probably wants to be updated. The point was to be sure that the projects were accounted together. The exact number wasn't particularly important.

@liggitt
Copy link
Contributor Author

liggitt commented May 4, 2017

@liggitt Since we don't always clean anymore, I guess we can race and get an extra.

We shouldn't be able to with a single controller and etcd, which is what that test runs with

@openshift-bot
Copy link
Contributor

openshift-bot commented May 11, 2017

continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 1

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to b2ff810

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to b2ff810

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1344/) (Base Commit: 2628c77)

@liggitt
Copy link
Contributor Author

liggitt commented May 11, 2017

included in #14033

@liggitt liggitt closed this May 11, 2017
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants