Skip to content

Commit 9881440

Browse files
authored
Merge pull request kubernetes#93224 from knabben/make-node-e2e
Documenting TEST_ARGS on Node E2E helper
2 parents a9f0fcc + 1044840 commit 9881440

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

build/root/Makefile

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -210,25 +210,39 @@ define TEST_E2E_NODE_HELP_INFO
210210
# Args:
211211
# FOCUS: Regexp that matches the tests to be run. Defaults to "".
212212
# SKIP: Regexp that matches the tests that needs to be skipped. Defaults
213-
# to "".
213+
# to "\[Flaky\]|\[Slow\]|\[Serial\]".
214+
# TEST_ARGS: A space-separated list of arguments to pass to node e2e test.
215+
# Defaults to "".
214216
# RUN_UNTIL_FAILURE: If true, pass --untilItFails to ginkgo so tests are run
215217
# repeatedly until they fail. Defaults to false.
216218
# REMOTE: If true, run the tests on a remote host instance on GCE. Defaults
217219
# to false.
218-
# IMAGES: For REMOTE=true only. Comma delimited list of images for creating
219-
# remote hosts to run tests against. Defaults to a recent image.
220+
# ARTIFACTS: Local directory to scp test artifacts into from the remote hosts
221+
# for REMOTE=true. Local directory to write juntil xml results into for REMOTE=false.
222+
# Defaults to "/tmp/_artifacts".
220223
# LIST_IMAGES: If true, don't run tests. Just output the list of available
221224
# images for testing. Defaults to false.
225+
# PARALLELISM: The number of ginkgo nodes to run. Defaults to 8.
226+
# RUNTIME: Container runtime to use (eg. docker, remote).
227+
# Defaults to "docker".
228+
# CONTAINER_RUNTIME_ENDPOINT: remote container endpoint to connect to.
229+
# Used when RUNTIME is set to "remote".
230+
# IMAGE_SERVICE_ENDPOINT: remote image endpoint to connect to, to prepull images.
231+
# Used when RUNTIME is set to "remote".
232+
# IMAGE_CONFIG_FILE: path to a file containing image configuration.
233+
# SYSTEM_SPEC_NAME: The name of the system spec to be used for validating the
234+
# image in the node conformance test. The specs are located at
235+
# test/e2e_node/system/specs/. For example, "SYSTEM_SPEC_NAME=gke" will use
236+
# the spec at test/e2e_node/system/specs/gke.yaml. If unspecified, the
237+
# default built-in spec (system.DefaultSpec) will be used.
238+
# IMAGES: For REMOTE=true only. Comma delimited list of images for creating
239+
# remote hosts to run tests against. Defaults to a recent image.
222240
# HOSTS: For REMOTE=true only. Comma delimited list of running gce hosts to
223241
# run tests against. Defaults to "".
224242
# DELETE_INSTANCES: For REMOTE=true only. Delete any instances created as
225243
# part of this test run. Defaults to false.
226244
# PREEMPTIBLE_INSTANCES: For REMOTE=true only. Mark created gce instances
227245
# as preemptible. Defaults to false.
228-
# ARTIFACTS: For REMOTE=true only. Local directory to scp test artifacts into
229-
# from the remote hosts. Defaults to "/tmp/_artifacts".
230-
# REPORT: For REMOTE=false only. Local directory to write juntil xml results
231-
# to. Defaults to "/tmp/".
232246
# CLEANUP: For REMOTE=true only. If false, do not stop processes or delete
233247
# test files on remote hosts. Defaults to true.
234248
# IMAGE_PROJECT: For REMOTE=true only. Project containing images provided to
@@ -238,19 +252,6 @@ define TEST_E2E_NODE_HELP_INFO
238252
# INSTANCE_METADATA: For REMOTE=true and running on GCE only.
239253
# GUBERNATOR: For REMOTE=true only. Produce link to Gubernator to view logs.
240254
# Defaults to false.
241-
# PARALLELISM: The number of gingko nodes to run. Defaults to 8.
242-
# RUNTIME: Container runtime to use (eg. docker, remote).
243-
# Defaults to "docker".
244-
# CONTAINER_RUNTIME_ENDPOINT: remote container endpoint to connect to.
245-
# Used when RUNTIME is set to "remote".
246-
# IMAGE_SERVICE_ENDPOINT: remote image endpoint to connect to, to prepull images.
247-
# Used when RUNTIME is set to "remote".
248-
# IMAGE_CONFIG_FILE: path to a file containing image configuration.
249-
# SYSTEM_SPEC_NAME: The name of the system spec to be used for validating the
250-
# image in the node conformance test. The specs are located at
251-
# test/e2e_node/system/specs/. For example, "SYSTEM_SPEC_NAME=gke" will use
252-
# the spec at test/e2e_node/system/specs/gke.yaml. If unspecified, the
253-
# default built-in spec (system.DefaultSpec) will be used.
254255
#
255256
# Example:
256257
# make test-e2e-node FOCUS=Kubelet SKIP=container
@@ -277,7 +278,7 @@ define TEST_E2E_KUBEADM_HELP_INFO
277278
# RUN_UNTIL_FAILURE: If true, pass --untilItFails to ginkgo so tests are run
278279
# repeatedly until they fail. Defaults to false.
279280
# ARTIFACTS: Local directory to save test artifacts into. Defaults to "/tmp/_artifacts".
280-
# PARALLELISM: The number of gingko nodes to run. If empty ginkgo default
281+
# PARALLELISM: The number of ginkgo nodes to run. If empty ginkgo default
281282
# parallelism (cores - 1) is used
282283
# BUILD: Build kubeadm end-to-end tests. Defaults to true.
283284
#

0 commit comments

Comments
 (0)