diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index b8678a0ea92..43dde0c740f 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -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}" \ diff --git a/test/e2e_node/remote/gce/gce_runner.go b/test/e2e_node/remote/gce/gce_runner.go index 4d08f4dda4c..27f542e90a8 100644 --- a/test/e2e_node/remote/gce/gce_runner.go +++ b/test/e2e_node/remote/gce/gce_runner.go @@ -74,6 +74,7 @@ var project = flag.String("project", "", "gce project the hosts live in (gce)") var zone = flag.String("zone", "", "gce zone that the hosts live in (gce)") var instanceMetadata = flag.String("instance-metadata", "", "key/value metadata for instances separated by '=' or '<', 'k=v' means the key is 'k' and the value is 'v'; 'k