From 599f646a4829d4c0bf5e032f3d89b2748d8ffc34 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 14 Jan 2016 10:48:32 -0800 Subject: [PATCH 1/3] Collapse GKE_DEFAULT_SKIP_TESTS into GKE_REQUIRED_SKIP_TESTS --- hack/jenkins/e2e.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 0af96b13ae2..81ae0095547 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -54,7 +54,7 @@ function join_regex_no_empty() { # Assumes globals: # $JOB_NAME # $KUBERNETES_PROVIDER -# $GKE_DEFAULT_SKIP_TESTS +# $GKE_REQUIRED_SKIP_TESTS # $GCE_DEFAULT_SKIP_TESTS # $GCE_FLAKY_TESTS # $GCE_SLOW_TESTS @@ -87,7 +87,7 @@ function configure_upgrade_step() { ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ )" local -r gke_test_args="--ginkgo.skip=$(join_regex_allow_empty \ - ${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ + ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ @@ -288,13 +288,6 @@ GKE_REQUIRED_SKIP_TESTS=( "Deployment" ) -# Specialized tests which should be skipped by default for GKE. -GKE_DEFAULT_SKIP_TESTS=( - # Perf test, slow by design - "resource\susage\stracking" - "${GKE_REQUIRED_SKIP_TESTS[@]}" - ) - # Tests which cannot be run on AWS. AWS_REQUIRED_SKIP_TESTS=( "experimental\sresource\susage\stracking" # Expect --max-pods=110 @@ -633,9 +626,10 @@ case ${JOB_NAME} in : ${PROJECT:="k8s-jkns-e2e-gke-ci"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ + ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ + ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ )"} ;; @@ -651,7 +645,7 @@ case ${JOB_NAME} in ) --ginkgo.skip=$(join_regex_no_empty \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ + ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ )"} ;; From d002a68f3c367e2b3e92854a42b1a94593261d40 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 14 Jan 2016 13:06:37 -0800 Subject: [PATCH 2/3] Label feature tests for Feature:DaemonSet, Feature:Deployment, Feature:ExperimentalResourceUsageTracking, and remove GKE and AWS skip lists --- hack/jenkins/e2e.sh | 35 +------------------------- test/e2e/daemon_set.go | 2 +- test/e2e/deployment.go | 2 +- test/e2e/horizontal_pod_autoscaling.go | 2 +- test/e2e/kubelet_perf.go | 2 +- 5 files changed, 5 insertions(+), 38 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 81ae0095547..a2e6fd173ab 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -54,7 +54,6 @@ function join_regex_no_empty() { # Assumes globals: # $JOB_NAME # $KUBERNETES_PROVIDER -# $GKE_REQUIRED_SKIP_TESTS # $GCE_DEFAULT_SKIP_TESTS # $GCE_FLAKY_TESTS # $GCE_SLOW_TESTS @@ -87,7 +86,6 @@ function configure_upgrade_step() { ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ )" local -r gke_test_args="--ginkgo.skip=$(join_regex_allow_empty \ - ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ @@ -272,30 +270,6 @@ GCE_DEFAULT_SKIP_TESTS=( "\[Feature:.+\]" ) -# PROVIDER SKIPS -------------------------------------- - -# Tests which cannot be run on GKE, e.g. because they require -# master ssh access. -GKE_REQUIRED_SKIP_TESTS=( - "Nodes" - "Etcd\sFailure" - "MasterCerts" - "experimental\sresource\susage\stracking" # Expect --max-pods=110 - "ServiceLoadBalancer" # issue: #16602 - "Shell" - # Alpha features, remove from skip when these move to beta - "Daemon\sset" - "Deployment" - ) - -# Tests which cannot be run on AWS. -AWS_REQUIRED_SKIP_TESTS=( - "experimental\sresource\susage\stracking" # Expect --max-pods=110 - "GCE\sL7\sLoadBalancer\sController" # GCE L7 loadbalancing -) - -# END PROVIDER SKIPS -------------------------------------- - # Tests which kills or restarts components and/or nodes. DISRUPTIVE_TESTS=( "\[Disruptive\]" @@ -357,7 +331,6 @@ case ${JOB_NAME} in ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ - ${AWS_REQUIRED_SKIP_TESTS[@]:+${AWS_REQUIRED_SKIP_TESTS[@]}} \ )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-aws"} : ${PROJECT:="k8s-jkns-e2e-aws"} @@ -465,7 +438,6 @@ case ${JOB_NAME} in ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${AWS_REQUIRED_SKIP_TESTS[@]:+${AWS_REQUIRED_SKIP_TESTS[@]}} \ )"} : ${ENABLE_DEPLOYMENTS:=true} # Override AWS defaults. @@ -626,7 +598,6 @@ case ${JOB_NAME} in : ${PROJECT:="k8s-jkns-e2e-gke-ci"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ @@ -645,7 +616,6 @@ case ${JOB_NAME} in ) --ginkgo.skip=$(join_regex_no_empty \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ )"} ;; @@ -655,9 +625,7 @@ case ${JOB_NAME} in : ${E2E_SET_CLUSTER_API_VERSION:=y} : ${PROJECT:="k8s-jkns-e2e-gke-ci-flaky"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} - : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}}) \ - --ginkgo.focus=$(join_regex_no_empty \ + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ )"} ;; @@ -690,7 +658,6 @@ case ${JOB_NAME} in # DISRUPTIVE_TESTS kill/restart components or nodes in the cluster, # defeating the purpose of a soak cluster. (#15722) : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${DISRUPTIVE_TESTS[@]:+${DISRUPTIVE_TESTS[@]}} \ diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index f038b07a921..130130c02b8 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -48,7 +48,7 @@ const ( daemonsetColorLabel = daemonsetLabelPrefix + "color" ) -var _ = Describe("Daemon set", func() { +var _ = Describe("Daemon set [Feature:DaemonSet]", func() { var f *Framework AfterEach(func() { diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index b37f6ed67a9..490fb57e098 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -30,7 +30,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = Describe("Deployment", func() { +var _ = Describe("Deployment [Feature:Deployment]", func() { f := NewFramework("deployment") It("deployment should create new pods", func() { diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go index 476f9165eb4..424e99a8661 100644 --- a/test/e2e/horizontal_pod_autoscaling.go +++ b/test/e2e/horizontal_pod_autoscaling.go @@ -38,7 +38,7 @@ var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Skipped]", f titleUp := "Should scale from 1 pod to 3 pods and from 3 to 5" titleDown := "Should scale from 5 pods to 3 pods and from 3 to 1" - Describe("Deployment", func() { + Describe("Deployment [Feature:Deployment]", func() { // CPU tests via deployments It(titleUp, func() { scaleUp("deployment", kindDeployment, rc, f) diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go index 568224902f1..f428ee1478f 100644 --- a/test/e2e/kubelet_perf.go +++ b/test/e2e/kubelet_perf.go @@ -184,7 +184,7 @@ var _ = Describe("Kubelet [Serial] [Slow]", func() { }) } }) - Describe("experimental resource usage tracking", func() { + Describe("experimental resource usage tracking [Feature:ExperimentalResourceUsageTracking]", func() { density := []int{100} for i := range density { podsPerNode := density[i] From a51f291b914cb76a6003bad27aa30193e49bf804 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Wed, 27 Jan 2016 16:10:33 -0800 Subject: [PATCH 3/3] Classify all HPA tests as [Feature:Autoscaling] --- test/e2e/horizontal_pod_autoscaling.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go index 424e99a8661..135daaadb04 100644 --- a/test/e2e/horizontal_pod_autoscaling.go +++ b/test/e2e/horizontal_pod_autoscaling.go @@ -31,14 +31,14 @@ const ( subresource = "scale" ) -var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Skipped]", func() { +var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Feature:Autoscaling]", func() { var rc *ResourceConsumer f := NewFramework("horizontal-pod-autoscaling") titleUp := "Should scale from 1 pod to 3 pods and from 3 to 5" titleDown := "Should scale from 5 pods to 3 pods and from 3 to 1" - Describe("Deployment [Feature:Deployment]", func() { + Describe("Deployment", func() { // CPU tests via deployments It(titleUp, func() { scaleUp("deployment", kindDeployment, rc, f) @@ -48,7 +48,7 @@ var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Skipped]", f }) }) - Describe("ReplicationController [Feature:Autoscaling]", func() { + Describe("ReplicationController", func() { // CPU tests via replication controllers It(titleUp, func() { scaleUp("rc", kindRC, rc, f)