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
c06c3705
Commit
c06c3705
authored
Jul 23, 2015
by
Wojciech Tyczynski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Require at least one healthy startup pod in GCE Jenkins e2e tests"
parent
361217e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
3 deletions
+0
-3
ginkgo-e2e.sh
hack/ginkgo-e2e.sh
+0
-1
e2e.sh
hack/jenkins/e2e.sh
+0
-2
No files found.
hack/ginkgo-e2e.sh
View file @
c06c3705
...
@@ -100,6 +100,5 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}"
...
@@ -100,6 +100,5 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}"
--node-instance-group
=
"
${
NODE_INSTANCE_GROUP
:-}
"
\
--node-instance-group
=
"
${
NODE_INSTANCE_GROUP
:-}
"
\
--num-nodes
=
"
${
NUM_MINIONS
:-}
"
\
--num-nodes
=
"
${
NUM_MINIONS
:-}
"
\
--prefix
=
"
${
KUBE_GCE_INSTANCE_PREFIX
:-
e2e
}
"
\
--prefix
=
"
${
KUBE_GCE_INSTANCE_PREFIX
:-
e2e
}
"
\
${
E2E_MIN_STARTUP_PODS
+
"--minStartupPods=
${
E2E_MIN_STARTUP_PODS
}
"
}
\
${
E2E_REPORT_DIR
+
"--report-dir=
${
E2E_REPORT_DIR
}
"
}
\
${
E2E_REPORT_DIR
+
"--report-dir=
${
E2E_REPORT_DIR
}
"
}
\
"
${
@
:-}
"
"
${
@
:-}
"
hack/jenkins/e2e.sh
View file @
c06c3705
...
@@ -55,7 +55,6 @@ E2E_OPT=${E2E_OPT:-""}
...
@@ -55,7 +55,6 @@ E2E_OPT=${E2E_OPT:-""}
# Set environment variables shared for all of the GCE Jenkins projects.
# Set environment variables shared for all of the GCE Jenkins projects.
if
[[
${
JOB_NAME
}
=
~ ^kubernetes-.
*
-gce
]]
;
then
if
[[
${
JOB_NAME
}
=
~ ^kubernetes-.
*
-gce
]]
;
then
KUBERNETES_PROVIDER
=
"gce"
KUBERNETES_PROVIDER
=
"gce"
:
${
E2E_MIN_STARTUP_PODS
:
=
"1"
}
:
${
E2E_ZONE
:
=
"us-central1-f"
}
:
${
E2E_ZONE
:
=
"us-central1-f"
}
:
${
MASTER_SIZE
:
=
"n1-standard-2"
}
:
${
MASTER_SIZE
:
=
"n1-standard-2"
}
:
${
MINION_SIZE
:
=
"n1-standard-2"
}
:
${
MINION_SIZE
:
=
"n1-standard-2"
}
...
@@ -261,7 +260,6 @@ export ZONE=${E2E_ZONE}
...
@@ -261,7 +260,6 @@ export ZONE=${E2E_ZONE}
export
KUBE_GKE_NETWORK
=
${
E2E_NETWORK
}
export
KUBE_GKE_NETWORK
=
${
E2E_NETWORK
}
# Shared cluster variables
# Shared cluster variables
export
E2E_MIN_STARTUP_PODS
=
${
E2E_MIN_STARTUP_PODS
:-}
export
MASTER_SIZE
=
${
MASTER_SIZE
:-}
export
MASTER_SIZE
=
${
MASTER_SIZE
:-}
export
MINION_SIZE
=
${
MINION_SIZE
:-}
export
MINION_SIZE
=
${
MINION_SIZE
:-}
export
NUM_MINIONS
=
${
NUM_MINIONS
:-}
export
NUM_MINIONS
=
${
NUM_MINIONS
:-}
...
...
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