Merge pull request #15860 from mikedanese/ds-promote

actually promote daemonset simple test out of flaky and skip all daemonset tests in gke
pull/6/head
Abhi Shah 2015-10-24 16:05:06 -07:00
commit 354b1f9c24
1 changed files with 2 additions and 2 deletions

View File

@ -109,7 +109,7 @@ GKE_REQUIRED_SKIP_TESTS=(
"Nodes"
"Etcd\sFailure"
"MasterCerts"
"Daemon\sset\sshould\srun\sand\sstop\scomplex\sdaemon"
"Daemon\sset"
"Deployment"
"experimental\sresource\susage\stracking" # Expect --max-pods=100
"Shell"
@ -134,7 +134,7 @@ DISRUPTIVE_TESTS=(
# -flaky- build variants.
GCE_FLAKY_TESTS=(
"DaemonRestart\sController\sManager"
"Daemon\sset\sshould"
"Daemon\sset\sshould\srun\sand\sstop\scomplex\sdaemon"
"Jobs\sare\slocally\srestarted"
"Resource\susage\sof\ssystem\scontainers"
"allows\sscheduling\sof\spods\son\sa\sminion\safter\sit\srejoins\sthe\scluster" # file: resize_nodes.go, issue: #13258