From d9bd480eddac9ec9faf1d3e25fda2bbdef061806 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 16 Nov 2021 01:15:03 +0530 Subject: [PATCH 1/3] adding comment in makefile Signed-off-by: Namanl2001 --- build/root/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/root/Makefile b/build/root/Makefile index 623a482a700..0a9c2e00fdc 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -256,6 +256,7 @@ define TEST_E2E_NODE_HELP_INFO # Defaults to false. # TEST_SUITE: For REMOTE=true only. Test suite to use. Defaults to "default". # SSH_KEY: For REMOTE=true only. Path to SSH key to use. +# RUNTIME_CONFIG: The runtime configuration for the API server on the node e2e tests. # # Example: # make test-e2e-node FOCUS=Kubelet SKIP=container From b990d8109a47d7e5e22ce69afcb2518bcd1e877f Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 16 Nov 2021 01:23:38 +0530 Subject: [PATCH 2/3] adding runtime-config Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 7d06162ef80..5abb9d2b615 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -100,6 +100,7 @@ if [ "${remote}" = true ] ; then gubernator=${GUBERNATOR:-"false"} image_config_file=${IMAGE_CONFIG_FILE:-""} image_config_dir=${IMAGE_CONFIG_DIR:-""} + runtime_config=${RUNTIME_CONFIG:-""} if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then image_project="${IMAGE_PROJECT:-"cos-cloud"}" gci_image=$(gcloud compute images list --project "${image_project}" \ @@ -171,7 +172,7 @@ if [ "${remote}" = true ] ; then go run test/e2e_node/runner/remote/run_remote.go --logtostderr --vmodule=*=4 --ssh-env="gce" \ --zone="${zone}" --project="${project}" --gubernator="${gubernator}" \ --hosts="${hosts}" --images="${images}" --cleanup="${cleanup}" \ - --results-dir="${artifacts}" --ginkgo-flags="${ginkgoflags}" \ + --results-dir="${artifacts}" --ginkgo-flags="${ginkgoflags}" --runtime_config="${runtime_config}" \ --image-project="${image_project}" --instance-name-prefix="${instance_prefix}" \ --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \ From 64a9988fcee091e28db2c4b1987057876e335cc4 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 16 Nov 2021 22:23:52 +0530 Subject: [PATCH 3/3] small nit Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 5abb9d2b615..c951afbadf9 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -172,7 +172,7 @@ if [ "${remote}" = true ] ; then go run test/e2e_node/runner/remote/run_remote.go --logtostderr --vmodule=*=4 --ssh-env="gce" \ --zone="${zone}" --project="${project}" --gubernator="${gubernator}" \ --hosts="${hosts}" --images="${images}" --cleanup="${cleanup}" \ - --results-dir="${artifacts}" --ginkgo-flags="${ginkgoflags}" --runtime_config="${runtime_config}" \ + --results-dir="${artifacts}" --ginkgo-flags="${ginkgoflags}" --runtime-config="${runtime_config}" \ --image-project="${image_project}" --instance-name-prefix="${instance_prefix}" \ --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \