From 952e2732d53752e4d5a7f3bd7fec169c13017aee Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Sat, 30 Oct 2021 01:12:32 +0530 Subject: [PATCH 1/2] adding make comment Signed-off-by: Namanl2001 --- build/root/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/root/Makefile b/build/root/Makefile index de60c5edb4b..46fea1fd332 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -231,6 +231,7 @@ define TEST_E2E_NODE_HELP_INFO # IMAGE_SERVICE_ENDPOINT: remote image endpoint to connect to, to prepull images. # Used when RUNTIME is set to "remote". # IMAGE_CONFIG_FILE: path to a file containing image configuration. +# IMAGE_CONFIG_DIR: path to image config files. # SYSTEM_SPEC_NAME: The name of the system spec to be used for validating the # image in the node conformance test. The specs are located at # test/e2e_node/system/specs/. For example, "SYSTEM_SPEC_NAME=gke" will use From 6d6bb48240a82f858626543402026c6ef67ee721 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Sat, 30 Oct 2021 01:23:02 +0530 Subject: [PATCH 2/2] passing image-config-dir Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index c6adb8b1b4b..24b25c35920 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -98,6 +98,7 @@ if [ "${remote}" = true ] ; then fi gubernator=${GUBERNATOR:-"false"} image_config_file=${IMAGE_CONFIG_FILE:-""} + image_config_dir=${IMAGE_CONFIG_DIR:-""} if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then image_project="${IMAGE_PROJECT:-"cos-cloud"}" gci_image=$(gcloud compute images list --project "${image_project}" \ @@ -172,7 +173,7 @@ 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}" \ + --ssh-user="${ssh_user}" --ssh-key="${ssh_key}" --image-config-dir="${image_config_dir}" \ --extra-envs="${extra_envs}" --test-suite="${test_suite}" \ "${timeout_arg}" \ 2>&1 | tee -i "${artifacts}/build-log.txt"