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: disable ResourceQuota e2e test for life of a secret #24754

Merged
merged 1 commit into from Mar 25, 2020
Merged

Bug 1785023: disable ResourceQuota e2e test for life of a secret #24754

merged 1 commit into from Mar 25, 2020

Conversation

mfojtik
Copy link
Member

@mfojtik mfojtik commented Mar 24, 2020

No description provided.

@openshift-ci-robot openshift-ci-robot added vendor-update Touching vendor dir or related files approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 24, 2020
@mfojtik mfojtik changed the title UPSTREAM: <carry>: disable ResourceQuota e2e test for life of a secret disable ResourceQuota e2e test for life of a secret Mar 24, 2020
@mfojtik
Copy link
Member Author

mfojtik commented Mar 24, 2020

/retest

@mfojtik mfojtik changed the title disable ResourceQuota e2e test for life of a secret Bug 1785023: disable ResourceQuota e2e test for life of a secret Mar 24, 2020
@mfojtik mfojtik removed the vendor-update Touching vendor dir or related files label Mar 24, 2020
@openshift-ci-robot
Copy link

@mfojtik: This pull request references Bugzilla bug 1785023, which is valid. The bug has been moved to the POST state. 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 NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1785023: disable 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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 24, 2020
soltysh
soltysh approved these changes Mar 24, 2020
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 24, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mfojtik, soltysh

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

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@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 adc3580 into openshift:master Mar 25, 2020
@openshift-ci-robot
Copy link

@mfojtik: All pull requests linked via external trackers have merged. Bugzilla bug 1785023 has been moved to the MODIFIED state.

In response to this:

Bug 1785023: disable 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.

adambkaplan added a commit to adambkaplan/origin that referenced this pull request Apr 1, 2020
@adambkaplan
Bug 1785023: Restore ResourceQuota e2e test for life of a secret
481596f 
This reverts commit adc3580, reversing
changes made to 4db8824 in openshift#24754
@adambkaplan adambkaplan mentioned this pull request Apr 1, 2020
Merged
@danehans
Copy link
Contributor

/cherry-pick release-4.4

@danehans
Copy link
Contributor

/cherry-pick release-4.3

@openshift-cherrypick-robot
Copy link

@danehans: #24754 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/rules.go
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 tests: disable 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.

@openshift-cherrypick-robot
Copy link

@danehans: #24754 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 tests: disable ResourceQuota e2e test for life of a secret. Version tests: disable 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 tests: disable ResourceQuota e2e test for life of a secret. Version tests: disable 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 tests: disable 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.

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

@soltysh soltysh soltysh approved these changes

@bparees bparees Awaiting requested review from bparees

Assignees

@soltysh soltysh

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. 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
@mfojtik @openshift-ci-robot @openshift-bot @danehans @openshift-cherrypick-robot @soltysh @openshift-merge-robot