github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17573 from wonderfly/blacklist_monitoring_test_for_trusty

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-23 05:31:03 -08:00
commit 7c2befe6df
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hack/jenkins/e2e.sh
View File

@ -236,7 +236,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"
@ -248,6 +248,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.
@ -583,7 +592,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"}
@ -602,7 +611,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"}