github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24345 from gmarek/enable_gatherer 

Automatic merge from submit-queue

Enable resource gatherer in Kubemark tests

Depends on #24291

Ref. #23820

cc @jlowdermilk
pull/6/head
k8s-merge-robot 2016-04-27 08:32:20 -07:00
parent 28bc4b32c2 24bf07cc20
commit 9db40b6b8d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/e2e-runner.sh
View File

@ -339,7 +339,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
# If start-kubemark fails, we trigger empty set of tests that would trigger storing logs from the base cluster.
./test/kubemark/start-kubemark.sh || dump_cluster_logs_and_exit
# Similarly, if tests fail, we trigger empty set of tests that would trigger storing logs from the base cluster.
./test/kubemark/run-e2e-tests.sh --ginkgo.focus="${KUBEMARK_TESTS}" --gather-resource-usage="false" || dump_cluster_logs_and_exit
./test/kubemark/run-e2e-tests.sh --ginkgo.focus="${KUBEMARK_TESTS}" "${KUBEMARK_TEST_ARGS}" || dump_cluster_logs_and_exit
./test/kubemark/stop-kubemark.sh
NUM_NODES=${NUM_NODES_BKP}
MASTER_SIZE=${MASTER_SIZE_BKP}

4
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-kubemark.yaml
View File

@ -48,6 +48,7 @@
export E2E_TEST="false"
export USE_KUBEMARK="true"
export KUBEMARK_TESTS="starting\s30\spods\sper\snode"
export KUBEMARK_TEST_ARGS="--gather-resource-usage=true"
# Override defaults to be independent from GCE defaults and set kubemark parameters
export NUM_NODES="1"
export MASTER_SIZE="n1-standard-1"
@ -65,6 +66,7 @@
export E2E_TEST="false"
export USE_KUBEMARK="true"
export KUBEMARK_TESTS="\[Feature:HighDensityPerformance\]"
export KUBEMARK_TEST_ARGS="--gather-resource-usage=true"
# Override defaults to be independent from GCE defaults and set kubemark parameters
export NUM_NODES="3"
export MASTER_SIZE="n1-standard-2"
@ -83,6 +85,7 @@
export E2E_TEST="false"
export USE_KUBEMARK="true"
export KUBEMARK_TESTS="\[Feature:Performance\]"
export KUBEMARK_TEST_ARGS="--gather-resource-usage=true"
export FAIL_ON_GCP_RESOURCE_LEAK="false"
# Override defaults to be independent from GCE defaults and set kubemark parameters
export NUM_NODES="6"
@ -103,6 +106,7 @@
export E2E_TEST="false"
export USE_KUBEMARK="true"
export KUBEMARK_TESTS="\[Feature:Performance\]"
export KUBEMARK_TEST_ARGS="--gather-resource-usage=true"
export FAIL_ON_GCP_RESOURCE_LEAK="false"
# Override defaults to be independent from GCE defaults and set kubemark parameters
# We need 11 so that we won't hit max-pods limit (set to 100). TODO: do it in a nicer way.