Merge pull request #30482 from mtaufen/eviction_disruptive

Automatic merge from submit-queue

Label MemoryEviction [Disruptive]

This test has the potential to be disruptive.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30482)
<!-- Reviewable:end -->
This commit is contained in:
Kubernetes Submit Queue 2016-08-12 09:39:29 -07:00 committed by GitHub
commit 90efb214ba

View File

@ -33,7 +33,7 @@ import (
// Eviction Policy is described here:
// https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/kubelet-eviction.md
var _ = framework.KubeDescribe("MemoryEviction [Slow] [Serial]", func() {
var _ = framework.KubeDescribe("MemoryEviction [Slow] [Serial] [Disruptive]", func() {
f := framework.NewDefaultFramework("eviction-test")
Context("When there is memory pressure", func() {