github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Collapse GKE_DEFAULT_SKIP_TESTS into GKE_REQUIRED_SKIP_TESTS

Browse Source
This commit is contained in:
Isaac Hollander McCreery
2016-01-14 10:48:32 -08:00
parent 458eb5284a
commit 599f646a48
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hack/jenkins/e2e.sh
View File

@@ -54,7 +54,7 @@ function join_regex_no_empty() {
# Assumes globals: # Assumes globals:
# $JOB_NAME # $JOB_NAME
# $KUBERNETES_PROVIDER # $KUBERNETES_PROVIDER
# $GKE_DEFAULT_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
@@ -87,7 +87,7 @@ function configure_upgrade_step() {
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)" )"
local -r gke_test_args="--ginkgo.skip=$(join_regex_allow_empty \ 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_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
@@ -288,13 +288,6 @@ GKE_REQUIRED_SKIP_TESTS=(
"Deployment" "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. # Tests which cannot be run on AWS.
AWS_REQUIRED_SKIP_TESTS=( AWS_REQUIRED_SKIP_TESTS=(
"experimental\sresource\susage\stracking" # Expect --max-pods=110 "experimental\sresource\susage\stracking" # Expect --max-pods=110
@@ -633,9 +626,10 @@ case ${JOB_NAME} in
: ${PROJECT:="k8s-jkns-e2e-gke-ci"} : ${PROJECT:="k8s-jkns-e2e-gke-ci"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ : ${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_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_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 \ ) --ginkgo.skip=$(join_regex_no_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \
)"} )"}
;; ;;