diff options
Diffstat (limited to 'infra/bots/recipes')
22 files changed, 47 insertions, 157 deletions
diff --git a/infra/bots/recipes/swarm_RecreateSKPs.py b/infra/bots/recipes/swarm_RecreateSKPs.py index bb281bbe53..8c06577a1b 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.py +++ b/infra/bots/recipes/swarm_RecreateSKPs.py @@ -92,14 +92,13 @@ def RunSteps(api): # Call GN. platform = 'linux64' # This bot only runs on linux; don't bother checking. gn = src_dir.join('buildtools', platform, 'gn') - api.step('GN', - [gn, 'gen', out_dir], - env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1', - 'GYP_GENERATORS': 'ninja'}) + gn_env = {'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1', + 'GYP_GENERATORS': 'ninja'} + with api.step.context({'env': gn_env}): + api.step('GN', [gn, 'gen', out_dir]) # Build Chrome. - api.step('Build Chrome', - ['ninja', '-C', out_dir, 'chrome']) + api.step('Build Chrome', ['ninja', '-C', out_dir, 'chrome']) # Clean up the output dir. output_dir = api.path['start_dir'].join('skp_output') @@ -120,10 +119,8 @@ def RunSteps(api): '--target_dir', output_dir] if 'Canary' not in api.properties['buildername']: cmd.append('--upload_to_partner_bucket') - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('Recreate SKPs', - cmd=cmd, - env=env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': env}): + api.step('Recreate SKPs', cmd=cmd) # Upload the SKPs. if 'Canary' not in api.properties['buildername']: @@ -136,10 +133,8 @@ def RunSteps(api): '--gitcookies', str(update_skps_gitcookies)] env.update(api.infra.go_env) with gitcookies_auth(api, UPDATE_SKPS_KEY): - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('Upload SKPs', - cmd=cmd, - env=env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': env}): + api.step('Upload SKPs', cmd=cmd) def GenTests(api): diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json index a7e6bf2cce..cbc0be27f0 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json @@ -88,9 +88,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, @@ -107,9 +107,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, @@ -124,9 +124,9 @@ "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", + "CC": "/usr/bin/clang", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", + "CXX": "/usr/bin/clang++", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index b3713888ae..9deb01e290 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 2202a42108..951d245dd8 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index 1bbb87c52a..ce81ed9bb4 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index db7b2c5525..3de613915d 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -118,8 +118,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -137,8 +135,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -154,8 +150,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index 67a694cec6..0f11391220 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 7289af684b..f5be4fa52b 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 15f4b8a446..089926b907 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 503ecb4816..d2f3f6dcc9 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 3980a9b505..067476bc4a 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index 0d69ba7137..e03ec42275 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 5f8af8108c..f1d2900225 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 150fe177b5..0105599d68 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -112,8 +112,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -131,8 +129,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, @@ -148,8 +144,6 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[START_DIR]/out" }, diff --git a/infra/bots/recipes/swarm_ct_skps.py b/infra/bots/recipes/swarm_ct_skps.py index 84f122a45e..81cb33cfbc 100644 --- a/infra/bots/recipes/swarm_ct_skps.py +++ b/infra/bots/recipes/swarm_ct_skps.py @@ -200,6 +200,7 @@ def RunSteps(api): tasks_to_swarm_hashes, dimensions=dimensions, io_timeout=40*60) # Now collect all tasks. + env = {'AWS_CREDENTIAL_FILE': None, 'BOTO_CONFIG': None} failed_tasks = [] for task in tasks: try: @@ -212,14 +213,14 @@ def RunSteps(api): gs_dest_dir = 'ct/%s/%d/%02d/%02d/%02d/' % ( ct_page_type, utc.year, utc.month, utc.day, utc.hour) for json_output in api.file.listdir('output dir', output_dir): - api.gsutil.upload( - name='upload json output', - source=output_dir.join(json_output), - bucket='skia-perf', - dest=gs_dest_dir, - env={'AWS_CREDENTIAL_FILE': None, 'BOTO_CONFIG': None}, - args=['-R'] - ) + with api.step.context({'env': env}): + api.gsutil.upload( + name='upload json output', + source=output_dir.join(json_output), + bucket='skia-perf', + dest=gs_dest_dir, + args=['-R'] + ) except api.step.StepFailure as e: # Add SKP links for convenience. diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json index bf92ca970a..8f87e81160 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -120,14 +120,6 @@ "456789" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "generate and upload binary size data" }, { diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json index 8acf95b2b6..f842478441 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json @@ -108,14 +108,6 @@ "RECIPE_MODULE[skia::core]/resources/generate_and_upload_doxygen.py" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "generate and upload doxygen" }, { @@ -130,14 +122,6 @@ "[DEPOT_TOOLS]/gsutil.py" ], "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GIT_HTTP_LOW_SPEED_LIMIT": "1000", - "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" - }, "name": "generate and upload binary size data" }, { diff --git a/infra/bots/recipes/swarm_housekeeper.py b/infra/bots/recipes/swarm_housekeeper.py index 1b9513c7ba..2dc248c69d 100644 --- a/infra/bots/recipes/swarm_housekeeper.py +++ b/infra/bots/recipes/swarm_housekeeper.py @@ -34,29 +34,28 @@ def RunSteps(api): # TODO(borenet): Detect static initializers? - gsutil_path = api.path['depot_tools'].join('gsutil.py') - if not api.vars.is_trybot: + with api.step.context({'cwd': cwd}): + gsutil_path = api.path['depot_tools'].join('gsutil.py') + if not api.vars.is_trybot: + api.run( + api.step, + 'generate and upload doxygen', + cmd=['python', api.core.resource('generate_and_upload_doxygen.py')], + abort_on_failure=False) + + cmd = ['python', api.core.resource('run_binary_size_analysis.py'), + '--library', api.vars.skia_out.join( + 'Release', 'lib', 'libskia.so'), + '--githash', api.properties['revision'], + '--gsutil_path', gsutil_path] + if api.vars.is_trybot: + cmd.extend(['--issue_number', str(api.properties['patch_issue'])]) api.run( api.step, - 'generate and upload doxygen', - cmd=['python', api.core.resource('generate_and_upload_doxygen.py')], - cwd=cwd, + 'generate and upload binary size data', + cmd=cmd, abort_on_failure=False) - cmd = ['python', api.core.resource('run_binary_size_analysis.py'), - '--library', api.vars.skia_out.join( - 'Release', 'lib', 'libskia.so'), - '--githash', api.properties['revision'], - '--gsutil_path', gsutil_path] - if api.vars.is_trybot: - cmd.extend(['--issue_number', str(api.properties['patch_issue'])]) - api.run( - api.step, - 'generate and upload binary size data', - cmd=cmd, - cwd=cwd, - abort_on_failure=False) - def GenTests(api): yield ( diff --git a/infra/bots/recipes/swarm_infra.py b/infra/bots/recipes/swarm_infra.py index bb70a6a160..ac371a88ce 100644 --- a/infra/bots/recipes/swarm_infra.py +++ b/infra/bots/recipes/swarm_infra.py @@ -24,10 +24,8 @@ def RunSteps(api): # Run the infra tests. infra_tests = api.vars.skia_dir.join('infra', 'bots', 'infra_tests.py') - with api.step.context({'cwd': api.vars.skia_dir}): - api.step('infra_tests', - cmd=['python', infra_tests], - env=api.infra.go_env) + with api.step.context({'cwd': api.vars.skia_dir, 'env': api.infra.go_env}): + api.step('infra_tests', cmd=['python', infra_tests]) def GenTests(api): diff --git a/infra/bots/recipes/swarm_presubmit.py b/infra/bots/recipes/swarm_presubmit.py index 940591e426..52b67cec8a 100644 --- a/infra/bots/recipes/swarm_presubmit.py +++ b/infra/bots/recipes/swarm_presubmit.py @@ -32,9 +32,9 @@ def RunSteps(api): depot_tools_path = api.depot_tools.package_repo_resource() env = {'PATH': api.path.pathsep.join([str(depot_tools_path), '%(PATH)s'])} - api.step('presubmit', - cmd=['git', 'cl', 'presubmit', '--force', '-v', '-v'], - env=env) + with api.step.context({'env': env}): + api.step('presubmit', + cmd=['git', 'cl', 'presubmit', '--force', '-v', '-v']) finally: api.step('git reset', cmd=['git', 'reset', '--hard', 'origin/master']) diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json index d125b7e952..1576c10569 100644 --- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json +++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json @@ -163,7 +163,6 @@ "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index c70125a860..e56cd5a1bb 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -132,12 +132,6 @@ "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[START_DIR]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, "infra_step": true, "name": "get uninteresting hashes", "~followup_annotations": [ |