github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106431 from Namanl2001/image-config-dir

Browse Source 
enabling runtime-config to be passed via make file for node-e2e testing purposes
This commit is contained in:
Kubernetes Prow Robot 2021-11-20 08:22:59 -08:00 committed by GitHub
commit ed07515ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/root/Makefile
View File

@ -256,6 +256,7 @@ define TEST_E2E_NODE_HELP_INFO
# Defaults to false. # Defaults to false.
# TEST_SUITE: For REMOTE=true only. Test suite to use. Defaults to "default". # 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. # 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: # Example:
# make test-e2e-node FOCUS=Kubelet SKIP=container # make test-e2e-node FOCUS=Kubelet SKIP=container

3
hack/make-rules/test-e2e-node.sh
View File

@ -100,6 +100,7 @@ if [ "${remote}" = true ] ; then
gubernator=${GUBERNATOR:-"false"} gubernator=${GUBERNATOR:-"false"}
image_config_file=${IMAGE_CONFIG_FILE:-""} image_config_file=${IMAGE_CONFIG_FILE:-""}
image_config_dir=${IMAGE_CONFIG_DIR:-""} image_config_dir=${IMAGE_CONFIG_DIR:-""}
runtime_config=${RUNTIME_CONFIG:-""}
if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then
image_project="${IMAGE_PROJECT:-"cos-cloud"}" image_project="${IMAGE_PROJECT:-"cos-cloud"}"
gci_image=$(gcloud compute images list --project "${image_project}" \ 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" \ go run test/e2e_node/runner/remote/run_remote.go --logtostderr --vmodule=*=4 --ssh-env="gce" \
--zone="${zone}" --project="${project}" --gubernator="${gubernator}" \ --zone="${zone}" --project="${project}" --gubernator="${gubernator}" \
--hosts="${hosts}" --images="${images}" --cleanup="${cleanup}" \ --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}" \ --image-project="${image_project}" --instance-name-prefix="${instance_prefix}" \
--delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \
--image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \