From ed508e9bf006c9547c9a3e98e85cc315380f0002 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Fri, 20 Nov 2015 10:20:35 -0800 Subject: [PATCH] Jenkins: Skip a flaky test on Trusty release job The monitoring test, i.e., "Monitoring should verify monitoring pods and all cluster nodes are available on influxdb using heapster" has been failing on the Trusty release job for a while and it is known that it won't be fixed until the next kubernetes release, see https://github.com/google/cadvisor/issues/947 for more details. Let's blacklist it so that the release job can be used to catch other real issues. --- hack/jenkins/e2e.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index ed0dd6839ff..aefb304e717 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -231,7 +231,7 @@ GCE_SOAK_CONTINUOUS_SKIP_TESTS=( GCE_RELEASE_SKIP_TESTS=( ) -TRUSTY_SKIP_TESTS=( +TRUSTY_DEFAULT_SKIP_TESTS=( # TODO(wonderfly): Remove this once # https://github.com/kubernetes/kubernetes/issues/12689 is fixed. "Services.*should\swork\safter\srestarting\skube-proxy" @@ -243,6 +243,15 @@ TRUSTY_SKIP_TESTS=( "Kubelet\sregular\sresource\susage\stracking\sover\s30m0s\swith\s0\spods\sper\snode" ) +TRUSTY_SKIP_TESTS=( + "${TRUSTY_DEFAULT_SKIP_TESTS[@]}" + "Monitoring\sshould\sverify\smonitoring\spods\sand\sall\scluster\snodes\sare\savailable\son\sinfluxdb\susing\sheapster" +) + +TRUSTY_BETA_SKIP_TESTS=( + "${TRUSTY_DEFAULT_SKIP_TESTS[@]}" +) + # Define environment variables based on the Jenkins project name. case ${JOB_NAME} in # Runs all non-flaky, non-slow tests on GCE, sequentially. @@ -574,7 +583,7 @@ case ${JOB_NAME} in ${GCE_RELEASE_SKIP_TESTS[@]:+${GCE_RELEASE_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ - ${TRUSTY_SKIP_TESTS[@]:+${TRUSTY_SKIP_TESTS[@]}} \ + ${TRUSTY_BETA_SKIP_TESTS[@]:+${TRUSTY_BETA_SKIP_TESTS[@]}} \ )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"} : ${PROJECT:="k8s-e2e-gce-trusty-beta"} @@ -593,7 +602,7 @@ case ${JOB_NAME} in : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ ) --ginkgo.skip=$(join_regex_allow_empty \ - ${TRUSTY_SKIP_TESTS[@]:+${TRUSTY_SKIP_TESTS[@]}} \ + ${TRUSTY_BETA_SKIP_TESTS[@]:+${TRUSTY_BETA_SKIP_TESTS[@]}} \ )"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-trusty-beta-slow"} : ${PROJECT:="k8s-e2e-gce-trusty-beta-slow"}