github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 05:46:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17718 from piosz/hpa-fix

Browse Source 
Yet another try to enable HPA e2e tests for 1.1 release
This commit is contained in:
Marcin Wielgus 2015-11-24 14:18:43 +01:00
commit a2299253cf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/e2e.sh
View File

@ -118,7 +118,6 @@ CURRENT_RELEASE_PUBLISHED_VERSION="ci/latest-1.1"
# Specialized to skip when running reboot tests. # Specialized to skip when running reboot tests.
REBOOT_SKIP_TESTS=( REBOOT_SKIP_TESTS=(
"\[Skipped\]"
"Restart\sshould\srestart\sall\snodes" "Restart\sshould\srestart\sall\snodes"
"\[Example\]" "\[Example\]"
) )
@ -126,6 +125,7 @@ REBOOT_SKIP_TESTS=(
# Specialized tests which should be skipped by default for projects. # Specialized tests which should be skipped by default for projects.
GCE_DEFAULT_SKIP_TESTS=( GCE_DEFAULT_SKIP_TESTS=(
"${REBOOT_SKIP_TESTS[@]}" "${REBOOT_SKIP_TESTS[@]}"
"\[Skipped\]"
"Reboot" "Reboot"
"ServiceLoadBalancer" "ServiceLoadBalancer"
) )
@ -651,6 +651,7 @@ case ${JOB_NAME} in
${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}}\ ${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}}\
) --ginkgo.focus=$(join_regex_no_empty \ ) --ginkgo.focus=$(join_regex_no_empty \
${DISRUPTIVE_TESTS[@]:+${DISRUPTIVE_TESTS[@]}} \ ${DISRUPTIVE_TESTS[@]:+${DISRUPTIVE_TESTS[@]}} \
# This test is not disruptive, however there is no better suite to run it.
"\[Autoscaling\]\sReplicationController" \ "\[Autoscaling\]\sReplicationController" \
"GCE\sL7\sLoadBalancer\sController" "GCE\sL7\sLoadBalancer\sController"
)"} )"}
@ -754,6 +755,7 @@ case ${JOB_NAME} in
: ${PROJECT:="k8s-jkns-e2e-gke-ci-reboot"} : ${PROJECT:="k8s-jkns-e2e-gke-ci-reboot"}
: ${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 \
"\[Skipped\]" \
${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ ${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \
${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}} \ ${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \