Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
db77843b
Commit
db77843b
authored
Mar 18, 2016
by
gmarek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EXIT_ON_WEAK_ERROR variable
parent
d5316c21
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
kube-up.sh
cluster/kube-up.sh
+2
-7
kubernetes-e2e.yaml
...enkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
+0
-1
No files found.
cluster/kube-up.sh
View file @
db77843b
...
@@ -25,7 +25,6 @@ set -o nounset
...
@@ -25,7 +25,6 @@ set -o nounset
set
-o
pipefail
set
-o
pipefail
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/..
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/..
EXIT_ON_WEAK_ERROR
=
"
${
EXIT_ON_WEAK_ERROR
:-
false
}
"
if
[
-f
"
${
KUBE_ROOT
}
/cluster/env.sh"
]
;
then
if
[
-f
"
${
KUBE_ROOT
}
/cluster/env.sh"
]
;
then
source
"
${
KUBE_ROOT
}
/cluster/env.sh"
source
"
${
KUBE_ROOT
}
/cluster/env.sh"
...
@@ -58,15 +57,11 @@ echo "... calling validate-cluster" >&2
...
@@ -58,15 +57,11 @@ echo "... calling validate-cluster" >&2
# We have two different failure modes from validate cluster:
# We have two different failure modes from validate cluster:
# - 1: fatal error - cluster won't be working correctly
# - 1: fatal error - cluster won't be working correctly
# - 2: weak error - something went wrong, but cluster probably will be working correctly
# - 2: weak error - something went wrong, but cluster probably will be working correctly
# We
always exit in case 1), but if EXIT_ON_WEAK_ERROR != true, then we don't fail on
2).
# We
just print an error message in case
2).
if
[[
"
${
validate_result
}
"
==
"1"
]]
;
then
if
[[
"
${
validate_result
}
"
==
"1"
]]
;
then
exit
1
exit
1
elif
[[
"
${
validate_result
}
"
==
"2"
]]
;
then
elif
[[
"
${
validate_result
}
"
==
"2"
]]
;
then
if
[[
"
${
EXIT_ON_WEAK_ERROR
}
"
==
"true"
]]
;
then
echo
"...ignoring non-fatal errors in validate-cluster"
>
&2
exit
1
;
else
echo
"...ignoring non-fatal errors in validate-cluster"
>
&2
fi
fi
fi
echo
-e
"Done, listing cluster services:
\n
"
>
&2
echo
-e
"Done, listing cluster services:
\n
"
>
&2
...
...
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
View file @
db77843b
...
@@ -542,7 +542,6 @@
...
@@ -542,7 +542,6 @@
export NODE_DISK_SIZE="50GB"
export NODE_DISK_SIZE="50GB"
export NUM_NODES="1000"
export NUM_NODES="1000"
export ALLOWED_NOTREADY_NODES="2"
export ALLOWED_NOTREADY_NODES="2"
export EXIT_ON_WEAK_ERROR="false"
# Reduce logs verbosity
# Reduce logs verbosity
export TEST_CLUSTER_LOG_LEVEL="--v=1"
export TEST_CLUSTER_LOG_LEVEL="--v=1"
export MAX_INSTANCES_PER_MIG="1000"
export MAX_INSTANCES_PER_MIG="1000"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment