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
b4a35598
Commit
b4a35598
authored
Jan 25, 2016
by
Quinton Hoole
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Jenkins e2e test job for multi-zone Ubernetes Lite
parent
8081956b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
2 deletions
+48
-2
util.sh
cluster/gce/util.sh
+11
-1
e2e-up.sh
hack/e2e-internal/e2e-up.sh
+10
-1
e2e.sh
hack/jenkins/e2e.sh
+22
-0
kubernetes-e2e.yaml
hack/jenkins/job-configs/kubernetes-e2e.yaml
+5
-0
No files found.
cluster/gce/util.sh
View file @
b4a35598
...
@@ -1252,7 +1252,17 @@ function test-teardown {
...
@@ -1252,7 +1252,17 @@ function test-teardown {
--project
"
${
PROJECT
}
"
\
--project
"
${
PROJECT
}
"
\
--quiet
\
--quiet
\
"
${
NODE_TAG
}
-
${
INSTANCE_PREFIX
}
-nodeports"
||
true
"
${
NODE_TAG
}
-
${
INSTANCE_PREFIX
}
-nodeports"
||
true
"
${
KUBE_ROOT
}
/cluster/kube-down.sh"
if
[[
${
MULTIZONE
:-}
==
"true"
]]
;
then
local
zones
=(
${
E2E_ZONES
}
)
# tear them down in reverse order, finally tearing down the master too.
for
((
zone_num
=
${#
zones
[@]
}
-1
;
zone_num>0
;
zone_num--
))
do
KUBE_GCE_ZONE
=
"
${
zones
[zone_num]
}
"
KUBE_USE_EXISTING_MASTER
=
"true"
"
${
KUBE_ROOT
}
/cluster/kube-down.sh"
done
KUBE_GCE_ZONE
=
"
${
zones
[0]
}
"
KUBE_USE_EXISTING_MASTER
=
"false"
"
${
KUBE_ROOT
}
/cluster/kube-down.sh"
else
"
${
KUBE_ROOT
}
/cluster/kube-down.sh"
fi
}
}
# SSH to a node by name ($1) and run a command ($2).
# SSH to a node by name ($1) and run a command ($2).
...
...
hack/e2e-internal/e2e-up.sh
View file @
b4a35598
...
@@ -31,5 +31,14 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
...
@@ -31,5 +31,14 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
prepare-e2e
prepare-e2e
KUBE_TEST_DEBUG
=
y
"
${
KUBE_VERSION_ROOT
}
/cluster/kube-up.sh"
if
[[
${
MULTIZONE
:-}
==
"true"
]]
;
then
for
KUBE_GCE_ZONE
in
${
E2E_ZONES
}
do
KUBE_GCE_ZONE
=
"
${
KUBE_GCE_ZONE
}
"
KUBE_USE_EXISTING_MASTER
=
"
${
KUBE_USE_EXISTING_MASTER
:-}
"
KUBE_TEST_DEBUG
=
y
"
${
KUBE_VERSION_ROOT
}
/cluster/kube-up.sh"
KUBE_USE_EXISTING_MASTER
=
"true"
# For subsequent zones we use the existing master
done
else
KUBE_TEST_DEBUG
=
y
"
${
KUBE_VERSION_ROOT
}
/cluster/kube-up.sh"
fi
test-setup
test-setup
hack/jenkins/e2e.sh
View file @
b4a35598
...
@@ -258,6 +258,26 @@ case ${JOB_NAME} in
...
@@ -258,6 +258,26 @@ case ${JOB_NAME} in
:
${
PROJECT
:
=
"k8s-jkns-e2e-gce-slow"
}
:
${
PROJECT
:
=
"k8s-jkns-e2e-gce-slow"
}
:
${
FAIL_ON_GCP_RESOURCE_LEAK
:
=
"true"
}
:
${
FAIL_ON_GCP_RESOURCE_LEAK
:
=
"true"
}
;;
;;
# Runs all non-flaky, non-slow tests on GCE, sequentially,
# and in a multi-zone ("Ubernetes Lite") cluster.
kubernetes-e2e-gce-ubernetes-lite
)
:
${
E2E_CLUSTER_NAME
:
=
"jenkins-gce-e2e-ubelite"
}
:
${
E2E_PUBLISH_GREEN_VERSION
:
=
"true"
}
:
${
E2E_NETWORK
:
=
"e2e-gce-ubelite"
}
:
${
GINKGO_TEST_ARGS
:
=
"--ginkgo.skip=
$(
join_regex_allow_empty
\
${
GCE_DEFAULT_SKIP_TESTS
[@]
:+
${
GCE_DEFAULT_SKIP_TESTS
[@]
}}
\
${
GCE_FLAKY_TESTS
[@]
:+
${
GCE_FLAKY_TESTS
[@]
}}
\
${
GCE_SLOW_TESTS
[@]
:+
${
GCE_SLOW_TESTS
[@]
}}
\
)
"
}
:
${
KUBE_GCE_INSTANCE_PREFIX
=
"e2e-gce-ubelite"
}
:
${
PROJECT
:
=
"k8s-jkns-e2e-gce-ubelite"
}
:
${
ENABLE_DEPLOYMENTS
:
=true
}
:
${
FAIL_ON_GCP_RESOURCE_LEAK
:
=
"true"
}
:
${
E2E_MULTIZONE
:
=
"true"
}
:
${
E2E_ZONE
:
=
""
}
:
${
E2E_ZONES
:
=us-central1-a us-central1-b us-central1-f
}
;;
# Run the [Serial], [Disruptive], and [Feature:Restart] tests on GCE.
# Run the [Serial], [Disruptive], and [Feature:Restart] tests on GCE.
kubernetes-e2e-gce-serial
)
kubernetes-e2e-gce-serial
)
...
@@ -742,6 +762,7 @@ export AWS_SHARED_CREDENTIALS_FILE=${AWS_SHARED_CREDENTIALS_FILE:-}
...
@@ -742,6 +762,7 @@ export AWS_SHARED_CREDENTIALS_FILE=${AWS_SHARED_CREDENTIALS_FILE:-}
# GCE variables
# GCE variables
export
INSTANCE_PREFIX
=
${
E2E_CLUSTER_NAME
}
export
INSTANCE_PREFIX
=
${
E2E_CLUSTER_NAME
}
export
KUBE_GCE_ZONE
=
${
E2E_ZONE
}
export
KUBE_GCE_ZONE
=
${
E2E_ZONE
}
export
MULTIZONE
=
${
E2E_MULTIZONE
:-}
# for building multi-zone Ubernetes Lite clusters
export
KUBE_GCE_NETWORK
=
${
E2E_NETWORK
}
export
KUBE_GCE_NETWORK
=
${
E2E_NETWORK
}
export
KUBE_GCE_INSTANCE_PREFIX
=
${
KUBE_GCE_INSTANCE_PREFIX
:-}
export
KUBE_GCE_INSTANCE_PREFIX
=
${
KUBE_GCE_INSTANCE_PREFIX
:-}
export
KUBE_GCE_NODE_PROJECT
=
${
KUBE_GCE_NODE_PROJECT
:-}
export
KUBE_GCE_NODE_PROJECT
=
${
KUBE_GCE_NODE_PROJECT
:-}
...
@@ -804,6 +825,7 @@ export E2E_TEST="${E2E_TEST:-true}"
...
@@ -804,6 +825,7 @@ export E2E_TEST="${E2E_TEST:-true}"
export
E2E_DOWN
=
"
${
E2E_DOWN
:-
true
}
"
export
E2E_DOWN
=
"
${
E2E_DOWN
:-
true
}
"
export
E2E_CLEAN_START
=
"
${
E2E_CLEAN_START
:-}
"
export
E2E_CLEAN_START
=
"
${
E2E_CLEAN_START
:-}
"
export
E2E_PUBLISH_GREEN_VERSION
=
"
${
E2E_PUBLISH_GREEN_VERSION
:-
false
}
"
export
E2E_PUBLISH_GREEN_VERSION
=
"
${
E2E_PUBLISH_GREEN_VERSION
:-
false
}
"
export
E2E_ZONES
=
${
E2E_ZONES
:-}
# for building multi-zone Ubernetes Lite clusters
# Used by hack/ginkgo-e2e.sh to enable ginkgo's parallel test runner.
# Used by hack/ginkgo-e2e.sh to enable ginkgo's parallel test runner.
export
GINKGO_PARALLEL
=
${
GINKGO_PARALLEL
:-}
export
GINKGO_PARALLEL
=
${
GINKGO_PARALLEL
:-}
export
GINKGO_PARALLEL_NODES
=
${
GINKGO_PARALLEL_NODES
:-}
export
GINKGO_PARALLEL_NODES
=
${
GINKGO_PARALLEL_NODES
:-}
...
...
hack/jenkins/job-configs/kubernetes-e2e.yaml
View file @
b4a35598
...
@@ -94,6 +94,11 @@
...
@@ -94,6 +94,11 @@
-
'
gce-examples'
:
-
'
gce-examples'
:
description
:
'
Run
e2e
examples
test
on
GCE
using
the
latest
successful
Kubernetes
build.'
description
:
'
Run
e2e
examples
test
on
GCE
using
the
latest
successful
Kubernetes
build.'
timeout
:
90
timeout
:
90
-
'
gce-ubernetes-lite'
:
description
:
'
Run
E2E
tests
on
GCE
across
multiple
zones
using
the
latest
successful
build.'
timeout
:
150
emails
:
'
$DEFAULT_RECIPIENTS,
quinton@google.com,
justin@fathomdb.com'
test-owner
:
'
quinton'
jobs
:
jobs
:
-
'
kubernetes-e2e-{suffix}'
-
'
kubernetes-e2e-{suffix}'
...
...
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