From b8b35afaecd47e460055078cebdd7b5298135ad6 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Mon, 19 Oct 2015 11:11:20 -0700 Subject: [PATCH] actually promote daemonset simple test out of flaky and skip all daemonset tests in gke --- hack/jenkins/e2e.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index d7bc061ac1..f60643474f 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -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" "should\sbe\sable\sto\schange\sthe\stype\sand\snodeport\ssettings\sof\sa\sservice" # file: service.go, issue: #13032