From f0cf6e2b6c394150d250eaf698989e6692da45b2 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 27 Jul 2017 13:32:56 +0200 Subject: [PATCH 1/3] fix fetching of GCE default credentials on kokoro windows --- .../internal_ci/helper_scripts/prepare_build_windows.bat | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/internal_ci/helper_scripts/prepare_build_windows.bat b/tools/internal_ci/helper_scripts/prepare_build_windows.bat index 643eb380e87..95fd6a3e8e3 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_windows.bat +++ b/tools/internal_ci/helper_scripts/prepare_build_windows.bat @@ -18,6 +18,14 @@ set PATH=C:\tools\msys64\usr\bin;C:\Python27;%PATH% bash tools/internal_ci/helper_scripts/gen_report_index.sh +@rem Add GCE DNS server and disable IPv6 to: +@rem 1. allow resolving metadata.google.internal hostname +@rem 2. make fetching default GCE credential by oauth2client work +netsh interface ipv4 add dnsservers "Local Area Connection 8" 10.240.0.1 index=1 +netsh interface teredo set state disabled +netsh interface 6to4 set state disabled +netsh interface isatap set state disabled + @rem Needed for big_query_utils python -m pip install google-api-python-client From a8381dee2c45e51a5a1f295a77cdfaafea80ec69 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 27 Jul 2017 17:37:46 +0200 Subject: [PATCH 2/3] add back --bq_result_table aggregate_results --- tools/internal_ci/windows/grpc_basictests.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/internal_ci/windows/grpc_basictests.cfg b/tools/internal_ci/windows/grpc_basictests.cfg index a116738651f..396d29ef093 100644 --- a/tools/internal_ci/windows/grpc_basictests.cfg +++ b/tools/internal_ci/windows/grpc_basictests.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows -j 1 --inner_jobs 8 --internal_ci" + value: "-f basictests windows -j 1 --inner_jobs 8 --internal_ci --bq_result_table aggregate_results" } From b74b94cdac6139120aa708f704f67f8fdc705a31 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 28 Jul 2017 09:47:32 +0200 Subject: [PATCH 3/3] better way to enable fetching GCE default credentials --- .../internal_ci/helper_scripts/prepare_build_windows.bat | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/internal_ci/helper_scripts/prepare_build_windows.bat b/tools/internal_ci/helper_scripts/prepare_build_windows.bat index 95fd6a3e8e3..69e087e1db1 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_windows.bat +++ b/tools/internal_ci/helper_scripts/prepare_build_windows.bat @@ -18,13 +18,12 @@ set PATH=C:\tools\msys64\usr\bin;C:\Python27;%PATH% bash tools/internal_ci/helper_scripts/gen_report_index.sh -@rem Add GCE DNS server and disable IPv6 to: +@rem Update DNS settings to: @rem 1. allow resolving metadata.google.internal hostname @rem 2. make fetching default GCE credential by oauth2client work -netsh interface ipv4 add dnsservers "Local Area Connection 8" 10.240.0.1 index=1 -netsh interface teredo set state disabled -netsh interface 6to4 set state disabled -netsh interface isatap set state disabled +netsh interface ip set dns "Local Area Connection 8" static 169.254.169.254 primary +netsh interface ip add dnsservers "Local Area Connection 8" 8.8.8.8 index=2 +netsh interface ip add dnsservers "Local Area Connection 8" 8.8.4.4 index=3 @rem Needed for big_query_utils python -m pip install google-api-python-client