github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add node-env and instance-type flags to node-e2e tests

Browse Source
This commit is contained in:
upodroid
2023-07-21 21:46:37 +00:00
parent 5f380d5be2
commit 1c99f9591b
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,9 +95,11 @@ if [ "${remote}" = true ] && [ "${remote_mode}" = gce ] ; then
image_project=${IMAGE_PROJECT:-"cos-cloud"}
metadata=${INSTANCE_METADATA:-""}
gubernator=${GUBERNATOR:-"false"}
instance_type=${INSTANCE_TYPE:-""}
node_env="${NODE_ENV:-""}"
image_config_file=${IMAGE_CONFIG_FILE:-""}
image_config_dir=${IMAGE_CONFIG_DIR:-""}
use_dockerized_build=${USE_DOCKERIZED_BUILD:-""}
use_dockerized_build=${USE_DOCKERIZED_BUILD:-"false"}
target_build_arch=${TARGET_BUILD_ARCH:-""}
runtime_config=${RUNTIME_CONFIG:-""}
if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then
@@ -159,11 +161,26 @@ if [ "${remote}" = true ] && [ "${remote_mode}" = gce ] ; then
echo "Project: ${project}"
echo "Image Project: ${image_project}"
echo "Compute/Zone: ${zone}"
echo "Images: ${images}"
echo "Hosts: ${hosts}"
if [[ -n ${images} ]]; then
echo "Images: ${images}"
fi
if [[ -n ${hosts} ]]; then
echo "Hosts: ${hosts}"
fi
echo "Test Args: ${test_args}"
echo "Ginkgo Flags: ${ginkgoflags}"
echo "Instance Metadata: ${metadata}"
echo "Image Config File: ${image_config_file}"
if [[ -n ${metadata} ]]; then
echo "Instance Metadata: ${metadata}"
fi
if [[ -n ${node_env} ]]; then
echo "Node-env: \"${node_env}\""
fi
if [[ -n ${image_config_file} ]]; then
echo "Image Config File: ${image_config_dir}/${image_config_file}"
fi
if [[ -n ${instance_type} ]]; then
echo "Instance Type: ${instance_type}"
fi
echo "Kubelet Config File: ${kubelet_config_file}"
# Invoke the runner
@@ -176,8 +193,8 @@ if [ "${remote}" = true ] && [ "${remote_mode}" = gce ] ; then
--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}" --ssh-options="${ssh_options}" \
--image-config-dir="${image_config_dir}" \
--use-dockerized-build="${use_dockerized_build}" \
--image-config-dir="${image_config_dir}" --node-env="${node_env}" \
--use-dockerized-build="${use_dockerized_build}" --instance-type="${instance_type}" \
--target-build-arch="${target_build_arch}" \
--extra-envs="${extra_envs}" --kubelet-config-file="${kubelet_config_file}" --test-suite="${test_suite}" \
"${timeout_arg}" \