Skip to content

Commit

Permalink
Merge pull request kubernetes#106431 from Namanl2001/image-config-dir
Browse files Browse the repository at this point in the history
enabling runtime-config to be passed via make file for node-e2e testing purposes
  • Loading branch information
k8s-ci-robot committed Nov 20, 2021
2 parents 21d3acc + 64a9988 commit ed07515
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions build/root/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion hack/make-rules/test-e2e-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down Expand Up @@ -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}" \
Expand Down

0 comments on commit ed07515

Please sign in to comment.