From 7e210fac5bb160c086ac3b0c2299190ae8a1e7df Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Wed, 6 Feb 2019 10:30:25 -0800 Subject: [PATCH 1/3] Pre-fetch Cocoapods master repo --- tools/internal_ci/helper_scripts/prepare_build_macos_rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 23619ecbb8b..2ecd39465d4 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -48,6 +48,10 @@ set -ex # cocoapods export LANG=en_US.UTF-8 +# pre-fetch cocoapods master repo with HEAD only +mkdir -p ~/.cocoapods/repos +git clone --depth 1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master + time pod repo update # needed by python # python From dc8bac54ad4a0b4aa8c3e14862ffee5b547dff9e Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Sat, 9 Feb 2019 22:16:29 -0800 Subject: [PATCH 2/3] patch --- tools/internal_ci/helper_scripts/prepare_build_macos_rc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 2ecd39465d4..e9ec07cd0f9 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -48,11 +48,9 @@ set -ex # cocoapods export LANG=en_US.UTF-8 -# pre-fetch cocoapods master repo with HEAD only +# pre-fetch cocoapods master repo's most recent commit only mkdir -p ~/.cocoapods/repos -git clone --depth 1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master - -time pod repo update # needed by python +time git clone --depth 1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master # python time pip install virtualenv --user python From 1124c4edd98ee2c051ebf99f36c55a3ea41df616 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Sun, 10 Feb 2019 11:22:30 -0800 Subject: [PATCH 3/3] increase timeout of cfstream-tests --- tools/run_tests/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 2556e777730..986e7cd58c2 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1126,7 +1126,7 @@ class ObjCLanguage(object): }), self.config.job_spec( ['test/core/iomgr/ios/CFStreamTests/run_tests.sh'], - timeout_seconds=10 * 60, + timeout_seconds=20 * 60, shortname='cfstream-tests', cpu_cost=1e6, environ=_FORCE_ENVIRON_FOR_WRAPPERS),