From e0723c1e64f314b0ff5178415c3d9be672dd713d Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 18 Oct 2021 22:30:11 -0400 Subject: [PATCH] test-e2e-node: add SSH_OPTIONS This allows overriding the default options. --- build/root/Makefile | 1 + hack/make-rules/test-e2e-node.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/root/Makefile b/build/root/Makefile index 0a9c2e00fdc..f15eccd7c27 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. +# SSH_OPTIONS: For REMOTE=true only. SSH options to use. # RUNTIME_CONFIG: The runtime configuration for the API server on the node e2e tests. # # Example: diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index c951afbadf9..8017006d3a5 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -49,6 +49,7 @@ extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} ssh_user=${SSH_USER:-"${USER}"} ssh_key=${SSH_KEY:-} +ssh_options=${SSH_OPTIONS:-} kubelet_config_file=${KUBELET_CONFIG_FILE:-"test/e2e_node/jenkins/default-kubelet-config.yaml"} # Parse the flags to pass to ginkgo @@ -177,7 +178,8 @@ if [ "${remote}" = true ] ; then --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \ --runtime-config="${runtime_config}" --preemptible-instances="${preemptible_instances}" \ - --ssh-user="${ssh_user}" --ssh-key="${ssh_key}" --image-config-dir="${image_config_dir}" \ + --ssh-user="${ssh_user}" --ssh-key="${ssh_key}" --ssh-options="${ssh_options}" \ + --image-config-dir="${image_config_dir}" \ --extra-envs="${extra_envs}" --kubelet-config-file="${kubelet_config_file}" --test-suite="${test_suite}" \ "${timeout_arg}" \ 2>&1 | tee -i "${artifacts}/build-log.txt"