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.

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

Bug 1785023: Restore ResourceQuota e2e test for life of a secret #24816

Merged
merged 1 commit into from Apr 7, 2020
Merged

Bug 1785023: Restore ResourceQuota e2e test for life of a secret #24816

merged 1 commit into from Apr 7, 2020

Conversation

adambkaplan
Copy link
Contributor

This reverts commit adc3580, reversing
changes made to 4db8824 in #24754

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 1, 2020
@openshift-ci-robot
Copy link

@adambkaplan: This pull request references Bugzilla bug 1785023, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1785023: Restore ResourceQuota e2e test for life of a secret

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 1, 2020
@adambkaplan
Copy link
Contributor Author

adambkaplan commented Apr 1, 2020 •
edited

/hold

Needs openshift/openshift-controller-manager#84 to land first

@adambkaplan
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2020
@adambkaplan
Copy link
Contributor Author

/retest

@openshift-ci-robot openshift-ci-robot mentioned this pull request Apr 5, 2020
Merged
@adambkaplan
Copy link
Contributor Author

/hold cancel

/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 6, 2020
@adambkaplan adambkaplan mentioned this pull request Apr 6, 2020
Merged
@bparees bparees added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Apr 7, 2020
@bparees
Copy link
Contributor

bparees commented Apr 7, 2020

@adambkaplan the changes in this PR don't look right?

@bparees bparees added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 7, 2020
@bparees
Copy link
Contributor

bparees commented Apr 7, 2020

nm

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, bparees

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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2020
@bparees
Copy link
Contributor

bparees commented Apr 7, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.4

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 8811970 into openshift:master Apr 7, 2020
@openshift-ci-robot
Copy link

@adambkaplan: Some pull requests linked via external trackers have merged: openshift/origin#24816. The following pull requests linked via external trackers have not merged:

In response to this:

Bug 1785023: Restore ResourceQuota e2e test for life of a secret

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

@bparees: #24816 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	test/extended/util/annotate/generated/zz_generated.annotations.go
M	test/extended/util/annotate/rules.go
Falling back to patching base and 3-way merge...
Auto-merging test/extended/util/annotate/generated/zz_generated.annotations.go
CONFLICT (content): Merge conflict in test/extended/util/annotate/generated/zz_generated.annotations.go
Patch failed at 0001 Bug 1785023: Restore ResourceQuota e2e test for life of a secret

In response to this:

/cherry-pick release-4.4

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.

@danehans
Copy link
Contributor

/cherry-pick release-4.3

@openshift-cherrypick-robot
Copy link

@danehans: #24816 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	test/extended/util/annotate/generated/zz_generated.annotations.go
A	test/extended/util/annotate/rules.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended/util/annotate/rules.go deleted in HEAD and modified in Bug 1785023: Restore ResourceQuota e2e test for life of a secret. Version Bug 1785023: Restore ResourceQuota e2e test for life of a secret of test/extended/util/annotate/rules.go left in tree.
CONFLICT (modify/delete): test/extended/util/annotate/generated/zz_generated.annotations.go deleted in HEAD and modified in Bug 1785023: Restore ResourceQuota e2e test for life of a secret. Version Bug 1785023: Restore ResourceQuota e2e test for life of a secret of test/extended/util/annotate/generated/zz_generated.annotations.go left in tree.
Patch failed at 0001 Bug 1785023: Restore ResourceQuota e2e test for life of a secret

In response to this:

/cherry-pick release-4.3

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.

@adambkaplan
Copy link
Contributor Author

@danehans my understanding is that these tests are still run in 4.4 and 4.3

@danehans
Copy link
Contributor

@adambkaplan ok, I think I understand the situation now. To confirm, this PR enables the tests b/c openshift/openshift-controller-manager#84 merged. PR 84 has been backported to 4.4 and 4.3, so we should now no longer see the CI flakes, correct?

@adambkaplan
Copy link
Contributor Author

To confirm, this PR enables the tests b/c openshift/openshift-controller-manager#84 merged. PR 84 has been backported to 4.4 and 4.3, so we should now no longer see the CI flakes, correct?

@danehans that is correct.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrogers950 mrogers950 Awaiting requested review from mrogers950

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@bparees bparees

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@adambkaplan @openshift-ci-robot @bparees @openshift-cherrypick-robot @openshift-bot @danehans @openshift-merge-robot