github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10905 from quinton-hoole/2015-07-07-multiline-regexes

Browse Source 
Make merge conflicts less likely in jenkins/e2e.sh w/ multiline regexes
This commit is contained in:
Quinton Hoole 2015-07-07 20:12:49 -07:00
commit 77be29e3da
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hack/jenkins/e2e.sh
View File

@ -66,15 +66,45 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
fi
# Specialized tests which should be skipped by default for projects.
GCE_DEFAULT_SKIP_TEST_REGEX="Skipped|Density|Reboot|Restart|Example"
GCE_DEFAULT_SKIP_TEST_REGEX="\
Skipped|\
Density|\
Reboot|\
Restart|\
Example\
"
# The following tests are known to be flaky, and are thus run only in their own
# -flaky- build variants.
GCE_FLAKY_TEST_REGEX="Elasticsearch|Shell.*services|MaxPods.*"
GCE_FLAKY_TEST_REGEX="\
Elasticsearch\
|Shell.*services\
|MaxPods.*\
"
# Tests which are not able to be run in parallel.
GCE_PARALLEL_SKIP_TEST_REGEX="${GCE_DEFAULT_SKIP_TEST_REGEX}|Etcd|NetworkingNew|Nodes\sNetwork|Nodes\sResize|MaxPods"
GCE_PARALLEL_SKIP_TEST_REGEX="\
${GCE_DEFAULT_SKIP_TEST_REGEX}\
|Etcd\
|NetworkingNew\
|Nodes\sNetwork\
|Nodes\sResize\
|MaxPods\
"
# Tests which are known to be flaky when run in parallel.
# TODO: figure out why GCE_FLAKY_TEST_REGEX is not a perfect subset of this list.
GCE_PARALLEL_FLAKY_TEST_REGEX="Addon|Elasticsearch|Hostdir.*MOD|Networking.*intra|PD|ServiceAccounts|Service\sendpoints\slatency|Services.*change\sthe\stype|Services.*functioning\sexternal\sload\sbalancer|Services.*identically\snamed|Services.*release.*load\sbalancer|Shell|multiport\sendpoints"
GCE_PARALLEL_FLAKY_TEST_REGEX="\
Addon\
|Elasticsearch\
|Hostdir.*MOD\
|Networking.*intra|PD\
|ServiceAccounts\
|Service\sendpoints\slatency\
|Services.*change\sthe\stype\
|Services.*functioning\sexternal\sload\sbalancer\
|Services.*identically\snamed\
|Services.*release.*load\sbalancer\
|Shell\
|multiport\sendpoints\
"
# Define environment variables based on the Jenkins project name.
case ${JOB_NAME} in