From 0f690105496fa7f1de4bee85f4bf035cdefa84a8 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 15 May 2018 15:04:58 -0400 Subject: [recipes] BUILDTYPE and SKIA_OUT are no longer used Bug: skia:6473 Change-Id: I67b0dbf6dba26233df1d8e44f3e2f69ca0cc9d3e Reviewed-on: https://skia-review.googlesource.com/128320 Commit-Queue: Eric Boren Reviewed-by: Stephan Altmueller Reviewed-by: Ben Wagner --- ...ld-Debian9-Clang-arm-Release-Android_API26.json | 12 +- ...ild-Debian9-Clang-arm-Release-Android_ASAN.json | 12 +- ...-Debian9-Clang-arm-Release-Chromebook_GLES.json | 12 +- ...d-Debian9-Clang-arm64-Release-Android_ASAN.json | 12 +- ...ebian9-Clang-universal-devrel-Android_SKQP.json | 24 +--- ...Debian9-Clang-x86_64-Debug-Chromebook_GLES.json | 12 +- .../Build-Debian9-Clang-x86_64-Debug-Coverage.json | 12 +- .../Build-Debian9-Clang-x86_64-Debug-MSAN.json | 12 +- ...ian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json | 12 +- ...-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 12 +- ...Build-Debian9-Clang-x86_64-Debug-SafeStack.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-ASAN.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-Fast.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-Mini.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-NoDEPS.json | 12 +- ...d-Debian9-Clang-x86_64-Release-SwiftShader.json | 20 +-- .../Build-Debian9-Clang-x86_64-Release-Vulkan.json | 12 +- .../Build-Debian9-EMCC-wasm-Release.json | 12 +- .../Build-Debian9-GCC-arm-Release-Chromecast.json | 12 +- .../Build-Debian9-GCC-loongson3a-Release.json | 12 +- ...d-Debian9-GCC-x86_64-Debug-EmbededResouces.json | 12 +- .../Build-Debian9-GCC-x86_64-Release-ANGLE.json | 12 +- ...Debian9-GCC-x86_64-Release-Flutter_Android.json | 8 +- .../Build-Debian9-GCC-x86_64-Release-NoGPU.json | 12 +- .../Build-Debian9-GCC-x86_64-Release-Shared.json | 12 +- ...Build-Mac-Clang-arm64-Debug-Android_Vulkan.json | 12 +- .../Build-Mac-Clang-arm64-Debug-iOS.json | 12 +- ...Build-Mac-Clang-x86_64-Debug-CommandBuffer.json | 16 +-- .../Build-Mac-Clang-x86_64-Debug-Metal.json | 12 +- .../Build-Win-Clang-arm64-Release-Android.json | 12 +- .../Build-Win-Clang-x86-Debug-Exceptions.json | 12 +- .../Build-Win-Clang-x86_64-Debug-GDI.json | 12 +- .../Build-Win-Clang-x86_64-Release-Vulkan.json | 12 +- .../Build-Win-Clang-x86_64-Release.json | 12 +- .../full.expected/Build-Win-MSVC-x86_64-Debug.json | 12 +- .../Housekeeper-PerCommit-CheckGeneratedFiles.json | 16 +-- ...E-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs.json | 12 +- ...930FD-GPU-MaliT880-arm64-Debug-All-Android.json | 116 ++++------------ ...us5x-GPU-Adreno418-arm64-Debug-All-Android.json | 144 +++++-------------- ...usPlayer-GPU-PowerVR-x86-Debug-All-Android.json | 132 +++++------------- ...ixel-GPU-Adreno530-arm64-Debug-All-Android.json | 132 +++++------------- ...hromebookPlus-GPU-MaliT860-arm-Release-All.json | 84 +++--------- ...-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 140 +++++-------------- ...9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json | 4 +- ...Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json | 2 - ...U-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json | 4 +- ...One-GPU-Mali400MP2-arm-Release-All-Android.json | 120 ++++------------ ...930FD-GPU-MaliT880-arm64-Debug-All-Android.json | 116 ++++------------ ...us5x-GPU-Adreno418-arm64-Debug-All-Android.json | 140 +++++-------------- ...U-Adreno418-arm64-Release-All-Android_ASAN.json | 144 +++++-------------- ...-Nexus7-CPU-Tegra3-arm-Release-All-Android.json | 120 ++++------------ ...ixel-GPU-Adreno530-arm64-Debug-All-Android.json | 132 +++++------------- ...hromebookPlus-GPU-MaliT860-arm-Release-All.json | 84 +++--------- ...CPU-AVX2-universal-devrel-All-Android_SKQP.json | 4 +- ...ang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json | 4 +- ...ng-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json | 4 +- ...-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader.json | 4 +- ...Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json | 2 - ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json | 2 - ...ebian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json | 4 +- ...g-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json | 2 - ...grind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 2 - ...droP400-x86_64-Release-All-Vulkan_ProcDump.json | 4 +- ...-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json | 4 +- ...S-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json | 108 ++++----------- .../examples/full.expected/cpu_scale_failed.json | 136 +++++------------- .../examples/full.expected/failed_infra_step.json | 132 +++++------------- .../full.expected/failed_read_version.json | 144 +++++-------------- .../examples/full.expected/retry_adb_command.json | 144 +++++-------------- .../retry_adb_command_retries_exhausted.json | 48 ++----- .../examples/full.expected/retry_ios_install.json | 116 ++++------------ .../retry_ios_install_retries_exhausted.json | 28 +--- .../examples/full.expected/failed_all_updates.json | 28 +--- .../examples/full.expected/failed_one_update.json | 16 +-- .../infra/examples/full.expected/infra_tests.json | 12 +- .../run/examples/full.expected/test.json | 76 +++-------- infra/bots/recipe_modules/vars/api.py | 3 - .../bookmaker.expected/nightly_bookmaker.json | 28 +--- .../nightly_failed_extract_fiddles.json | 16 +-- .../nightly_failed_fiddlecli.json | 20 +-- .../bookmaker.expected/nightly_failed_fiddles.json | 24 +--- .../bookmaker.expected/nightly_failed_upload.json | 24 +--- .../bookmaker.expected/percommit_bookmaker.json | 16 +-- .../percommit_failed_validation.json | 16 +-- ...ian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json | 4 +- ...ang-Golo-GPU-QuadroP400-x86_64-Release-All.json | 4 +- .../Housekeeper-PerCommit-CheckGeneratedFiles.json | 32 ++--- ...-Debian9-Clang-arm-Release-Chromebook_GLES.json | 12 +- .../Build-Debian9-Clang-arm64-Release-Android.json | 12 +- ...d-Debian9-Clang-arm64-Release-Android_ASAN.json | 12 +- ...Debian9-Clang-arm64-Release-Android_Vulkan.json | 12 +- .../Build-Debian9-Clang-x86_64-Debug-ASAN.json | 12 +- .../Build-Debian9-Clang-x86_64-Debug-Coverage.json | 12 +- .../Build-Debian9-Clang-x86_64-Debug-MSAN.json | 12 +- ...-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 12 +- .../Build-Debian9-Clang-x86_64-Debug.json | 12 +- ...bian9-Clang-x86_64-Release-Chromebook_GLES.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-Fast.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-Mini.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-NoDEPS.json | 12 +- .../Build-Debian9-Clang-x86_64-Release-Vulkan.json | 12 +- ...bian9-Clang-x86_64-Release-Vulkan_Coverage.json | 12 +- .../Build-Debian9-EMCC-wasm-Release.json | 12 +- .../Build-Debian9-GCC-arm-Release-Chromecast.json | 12 +- .../Build-Debian9-GCC-x86-Debug.json | 12 +- .../Build-Debian9-GCC-x86_64-Debug-NoGPU.json | 12 +- .../Build-Debian9-GCC-x86_64-Release-ANGLE.json | 12 +- ...Debian9-GCC-x86_64-Release-Flutter_Android.json | 8 +- .../Build-Debian9-GCC-x86_64-Release-Shared.json | 12 +- .../Build-Mac-Clang-arm64-Debug-Android.json | 12 +- .../Build-Mac-Clang-arm64-Debug-iOS.json | 12 +- .../Build-Mac-Clang-x64-Release-iOS.json | 12 +- ...Build-Mac-Clang-x86_64-Debug-CommandBuffer.json | 16 +-- .../Build-Mac-Clang-x86_64-Release.json | 12 +- .../Build-Win-Clang-arm64-Release-Android.json | 12 +- .../Build-Win-Clang-x86-Debug-Exceptions.json | 12 +- .../Build-Win-Clang-x86-Debug.json | 12 +- .../Build-Win-Clang-x86_64-Debug-ANGLE.json | 12 +- .../Build-Win-Clang-x86_64-Release-Vulkan.json | 12 +- .../recipes/compile.expected/alternate_repo.json | 12 +- .../recipes/compile.expected/flutter_trybot.json | 8 +- infra/bots/recipes/compile.expected/trybot.json | 12 +- .../ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json | 12 +- .../recipes/ct_skps.expected/CT_DM_100k_SKPs.json | 12 +- .../recipes/ct_skps.expected/CT_DM_10k_SKPs.json | 12 +- .../ct_skps.expected/CT_DM_10k_SKPs_Trybot.json | 12 +- .../recipes/ct_skps.expected/CT_DM_1m_SKPs.json | 12 +- .../CT_DM_1m_SKPs_2slaves_failure.json | 12 +- .../CT_DM_1m_SKPs_slave3_failure.json | 12 +- .../ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json | 12 +- .../ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json | 12 +- .../ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json | 12 +- .../ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json | 12 +- .../CT_IMG_DECODE_10k_SKPs_Trybot.json | 12 +- .../Housekeeper-PerCommit-Trybot.json | 4 +- .../Housekeeper-PerCommit.json | 8 +- .../recipes/infra.expected/failed_all_updates.json | 28 +--- .../recipes/infra.expected/failed_one_update.json | 16 +-- infra/bots/recipes/infra.expected/infra_tests.json | 12 +- ...GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json | 108 ++++----------- ...Nexus5-GPU-Adreno330-arm-Debug-All-Android.json | 120 ++++------------ ...5x-GPU-Adreno418-arm64-Release-All-Android.json | 148 +++++--------------- ...-Nexus7-CPU-Tegra3-arm-Release-All-Android.json | 128 +++++------------ ...-Nexus7-GPU-Tegra3-arm-Release-All-Android.json | 128 +++++------------ ...Player-GPU-PowerVR-x86-Release-All-Android.json | 136 +++++------------- ...GPU-PowerVR-x86-Release-All-Android_Vulkan.json | 136 +++++------------- ...TegraX1-arm64-Release-All-Android_Skpbench.json | 136 +++++------------- ...ebookFlipC100-GPU-MaliT764-arm-Release-All.json | 96 ++++--------- ...st-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json | 76 +++-------- ...-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 88 +++--------- ...9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json | 2 - ...ian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json | 4 +- ...PYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json | 2 - ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json | 2 - ...7i5BNK-GPU-IntelIris640-x86_64-Release-All.json | 2 - ...lang-MacMini7.1-CPU-AVX-x86_64-Release-All.json | 4 +- ...lIris5100-x86_64-Release-All-CommandBuffer.json | 4 +- ...ni7.1-GPU-IntelIris5100-x86_64-Release-All.json | 4 +- ...grind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 2 - ...64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json | 2 - ...GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json | 4 +- ...PU-RadeonR9M470X-x86_64-Release-All-Vulkan.json | 4 +- ...lo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json | 4 +- ...-GPU-IntelIris540-x86_64-Release-All-ANGLE.json | 4 +- ...GPU-IntelIris540-x86_64-Release-All-Vulkan.json | 4 +- ...uttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json | 4 +- ...Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json | 4 +- ...n2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json | 4 +- ...Clang-iPadPro-GPU-GT7800-arm64-Release-All.json | 104 ++++---------- .../recipes/perf.expected/cpu_scale_failed.json | 104 ++++---------- .../perf.expected/cpu_scale_failed_golo.json | 116 ++++------------ .../perf.expected/cpu_scale_failed_once.json | 128 +++++------------ infra/bots/recipes/perf.expected/failed_push.json | 16 +-- infra/bots/recipes/perf.expected/trybot.json | 4 +- .../Housekeeper-Nightly-RecreateSKPs_Canary.json | 12 +- .../Housekeeper-Weekly-RecreateSKPs.json | 28 +--- .../recreate_skps.expected/failed_upload.json | 28 +--- ...30-arm64-Release-All-Android_CCPR_Skpbench.json | 48 ++----- ...TegraX1-arm64-Release-All-Android_Skpbench.json | 48 ++----- ...-arm64-Release-All-Android_Vulkan_Skpbench.json | 48 ++----- infra/bots/recipes/skpbench.expected/trybot.json | 48 ++----- ...CPU-AVX2-universal-devrel-All-Android_SKQP.json | 4 +- ...One-GPU-Mali400MP2-arm-Release-All-Android.json | 132 +++++------------- ...axyS6-GPU-MaliT760-arm64-Debug-All-Android.json | 128 +++++------------ ...930A-GPU-Adreno530-arm64-Debug-All-Android.json | 128 +++++------------ ...Shield-GPU-TegraX1-arm64-Debug-All-Android.json | 128 +++++------------ ...d-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json | 128 +++++------------ ...xus5-GPU-Adreno330-arm-Release-All-Android.json | 132 +++++------------- ...Snapdragon808-arm-Release-All-Android_ASAN.json | 136 +++++------------- ...x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json | 136 +++++------------- ...GPU-Adreno418-arm64-Debug-All-Android_ASAN.json | 136 +++++------------- ...no418-arm64-Debug-All-Android_NoGPUThreads.json | 152 ++++++--------------- ...-Nexus7-CPU-Tegra3-arm-Release-All-Android.json | 132 +++++------------- ...ng-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json | 132 +++++------------- ...yer-CPU-Moorefield-x86-Release-All-Android.json | 136 +++++------------- ...GPU-PowerVR-x86-Release-All-Android_Vulkan.json | 136 +++++------------- ...GPU-Adreno530-arm64-Debug-All-Android_CCPR.json | 144 +++++-------------- ...U-Adreno530-arm64-Debug-All-Android_Vulkan.json | 144 +++++-------------- ...eno540-arm64-Debug-All-Android_DDL1_Vulkan.json | 152 ++++++--------------- ...eno540-arm64-Debug-All-Android_DDL3_Vulkan.json | 152 ++++++--------------- ...omebookFlipC100-GPU-MaliT764-arm-Debug-All.json | 100 ++++---------- ...onvertible-GPU-PowerVRGX6250-arm-Debug-All.json | 100 ++++---------- ...-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json | 96 ++++--------- ...-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 96 ++++--------- ...9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json | 2 - ...9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json | 4 +- ...ug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json | 8 +- ...-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json | 8 +- ...CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json | 4 +- ...lease-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json | 8 +- ...CE-CPU-AVX2-x86_64-Release-All-SwiftShader.json | 8 +- ...Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json | 2 - ...g-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json | 6 +- ...H-GPU-IntelHD405-x86_64-Release-All-Vulkan.json | 6 +- ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json | 6 +- ...15TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json | 6 +- ...est-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json | 8 +- ...-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json | 8 +- ...acBook10.1-GPU-IntelHD615-x86_64-Debug-All.json | 8 +- ...-IntelHD615-x86_64-Release-All-NativeFonts.json | 8 +- ...ookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json | 8 +- ...lang-MacMini7.1-CPU-AVX-x86_64-Release-All.json | 8 +- ...telIris5100-x86_64-Debug-All-CommandBuffer.json | 8 +- ...-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json | 8 +- ...-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json | 8 +- ...uadroP400-x86_64-Debug-All-Vulkan_Coverage.json | 4 +- ...grind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 2 - ...nd_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 2 - ...64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json | 2 - ...2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json | 8 +- ...-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json | 8 +- ...64-Release-All-ReleaseAndAbandonGpuContext.json | 8 +- ...7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json | 8 +- ...-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json | 8 +- ...YK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json | 8 +- ...K-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json | 8 +- ...H-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json | 8 +- ...huttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json | 8 +- ...ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json | 8 +- ...g-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json | 8 +- ...10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json | 8 +- ...6-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json | 8 +- ...6-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json | 8 +- ...6-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json | 8 +- ...Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json | 8 +- ...Clang-iPadPro-GPU-GT7800-arm64-Release-All.json | 112 ++++----------- infra/bots/recipes/test.expected/failed_dm.json | 8 +- .../recipes/test.expected/failed_get_hashes.json | 132 +++++------------- infra/bots/recipes/test.expected/failed_pull.json | 132 +++++------------- infra/bots/recipes/test.expected/failed_push.json | 16 +-- .../bots/recipes/test.expected/internal_bot_1.json | 128 +++++------------ .../bots/recipes/test.expected/internal_bot_2.json | 128 +++++------------ infra/bots/recipes/test.expected/trybot.json | 8 +- platform_tools/android/bin/android_perf | 2 +- platform_tools/ios/bin/ios_setup.sh | 10 -- 255 files changed, 2444 insertions(+), 7383 deletions(-) diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json index b57ee7b377..4320188d25 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_API26.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_API26" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json index 8d614be543..01914e013e 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json index b8711d0aa8..24e2324484 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json @@ -21,11 +21,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -39,11 +37,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -59,11 +55,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index 273f4beab3..11ddef0b7a 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json index b3d023ce5d..762dc757d5 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -36,12 +34,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -52,12 +48,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -71,12 +65,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs" }, @@ -90,12 +82,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "build firebase runner" }, @@ -108,10 +98,8 @@ "ANDROID_HOME": "[START_DIR]/android_sdk_linux/android-sdk", "ANDROID_NDK": "[START_DIR]/android_ndk_linux", "APK_OUTPUT_DIR": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel", - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "make_universal" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json index ed37e82d3a..d5261c45fa 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -57,10 +53,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json index 124b3f5963..02b1caa480 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json index 984a7b7c09..8b07490706 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json index 075eeb8f45..093e7850ca 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 8bee355500..4adf4c2415 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json index ffd7d00c54..770665ae30 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-SafeStack.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SafeStack" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SafeStack" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SafeStack" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json index 85c9264793..057426b294 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-ASAN.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json index 9b13eca9ed..757be74eec 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Fast.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json index 0616d24dcd..f2f4dbcd02 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json index 09b3b02a3e..69c5610b4d 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json index 98ebab4727..688a889b46 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json @@ -36,12 +36,10 @@ ], "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", "env": { - "BUILDTYPE": "Release", "CC": "[START_DIR]/clang_linux/bin/clang", "CHROME_HEADLESS": "1", "CXX": "[START_DIR]/clang_linux/bin/clang++", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin" }, "name": "swiftshader cmake" }, @@ -55,12 +53,10 @@ ], "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/swiftshader_out", "env": { - "BUILDTYPE": "Release", "CC": "[START_DIR]/clang_linux/bin/clang", "CHROME_HEADLESS": "1", "CXX": "[START_DIR]/clang_linux/bin/clang++", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin" }, "name": "swiftshader ninja" }, @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -89,10 +83,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -106,10 +98,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json index 4cefd3f307..cddf990088 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json index f3371b7a20..b45e79090d 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-arm-Release-Chromecast.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-arm-Release-Chromecast.json index 1c39637828..4a9cce304f 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-arm-Release-Chromecast.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -57,10 +53,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json index 209e616629..1eb4c78bc3 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,11 +36,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/mips64el_toolchain_linux/lib/x86_64-linux-gnu/", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -56,11 +52,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/mips64el_toolchain_linux/lib/x86_64-linux-gnu/", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-loongson3a-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json index dab6383eb9..8f74469be1 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index a38e234371..e658ad6986 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json index dacf8bdedc..a79f3f1a22 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json @@ -34,10 +34,8 @@ ], "cwd": "[START_DIR]/cache/work/flutter/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn_gen" }, @@ -50,10 +48,8 @@ ], "cwd": "[START_DIR]/cache/work/flutter/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "build_flutter" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json index 3b673fde7b..610a2f7736 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-NoGPU.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-NoGPU" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json index 519c0a8da1..9a9d7d17d2 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Shared.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json index 824ead6189..0a0a1d171a 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android_Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json index a37e449ded..5193f32325 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index e3d89bcd3e..b667cc5516 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -13,10 +13,8 @@ "--make-output-dir" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "build command_buffer" }, @@ -28,10 +26,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -45,10 +41,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -62,10 +56,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json index 86443fd445..628997b58f 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-Metal" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json index c23e0a35ae..f44f9ad910 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json index 5d080e4f35..a06c030ec0 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json index d2c158de37..b3f8e8798c 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-GDI.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-GDI" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index dc9b8cd8ee..40be496a10 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release.json index 977d964044..f8d7a37d73 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug.json index e2fb634dc0..3e6bafe139 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-MSVC-x86_64-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -24,10 +22,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-MSVC-x86_64-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -41,10 +37,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-MSVC-x86_64-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index c901ba3242..19ee66366b 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -7,10 +7,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -23,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-clang-format" @@ -40,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -57,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs.json b/infra/bots/recipe_modules/build/examples/full.expected/Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs.json index 5f175ed4b2..9334c263f3 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Test-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Debug-All-CT_DM_10k_SKPs.json @@ -21,10 +21,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -38,10 +36,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -55,10 +51,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index d9b811877e..7029ec28f0 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -598,10 +552,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -629,10 +581,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -645,10 +595,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -687,10 +635,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android/data" @@ -703,10 +649,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -737,10 +681,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 84cbc94065..9058f6d600 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to userspace", @@ -643,10 +595,8 @@ "4" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000", @@ -719,10 +669,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 0", @@ -771,10 +719,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 1", @@ -823,10 +769,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 2", @@ -875,10 +819,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 3", @@ -926,10 +868,8 @@ "600000000" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Lock GPU to 600000000 (and other perf tweaks)", @@ -990,10 +930,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -1021,10 +959,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -1037,10 +973,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1079,10 +1013,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android/data" @@ -1095,10 +1027,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1129,10 +1059,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json index 85ad5b8caf..8e6404caac 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -643,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -719,10 +669,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -763,10 +711,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -838,10 +784,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -869,10 +813,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -885,10 +827,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -927,10 +867,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data" @@ -943,10 +881,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -977,10 +913,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json index a3791dbd82..ea736f63c7 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -643,10 +595,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -719,10 +669,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 0", @@ -771,10 +719,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 1", @@ -822,10 +768,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -853,10 +797,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -869,10 +811,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -911,10 +851,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android/data" @@ -927,10 +865,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -961,10 +897,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json index bb83c7fc78..b5cb598979 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json @@ -6,10 +6,8 @@ "\nimport os\nSSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')\nwith open(SSH_MACHINE_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromeos ip", @@ -84,10 +82,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -105,10 +101,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -126,10 +120,8 @@ "/home/chronos/user/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -150,10 +142,8 @@ "/home/chronos" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -171,10 +161,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -192,10 +180,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -260,10 +246,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -282,10 +266,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -303,10 +285,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -324,10 +304,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -412,10 +390,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -434,10 +410,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -455,10 +429,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -476,10 +448,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -564,10 +534,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -586,10 +554,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -607,10 +573,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -628,10 +592,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -737,10 +699,8 @@ "/home/chronos/user/bin/nanobench" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "chmod nanobench" @@ -757,10 +717,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "nanobench" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index b07208c344..6944a848fd 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -6,10 +6,8 @@ "\nimport os\nCHROMECAST_IP_FILE = os.path.expanduser('~/chromecast.txt')\nwith open(CHROMECAST_IP_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromecast ip", @@ -30,10 +28,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -47,10 +43,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -93,10 +87,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -111,10 +103,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -129,10 +119,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -147,10 +135,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -164,10 +150,8 @@ "/cache/skia/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -230,10 +214,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -249,10 +231,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -267,10 +247,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -285,10 +263,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -302,10 +278,8 @@ "/cache/skia/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -340,10 +314,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -385,10 +357,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SK_IMAGE_VERSION", @@ -404,10 +374,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SK_IMAGE_VERSION" @@ -422,10 +390,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/images" @@ -440,10 +406,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/images" @@ -457,10 +421,8 @@ "/cache/skia/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /cache/skia/images", @@ -495,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /cache/skia/SK_IMAGE_VERSION" @@ -540,10 +500,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SVG_VERSION", @@ -559,10 +517,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SVG_VERSION" @@ -577,10 +533,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/svgs" @@ -595,10 +549,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/svgs" @@ -612,10 +564,8 @@ "/cache/skia/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /cache/skia/svgs", @@ -650,10 +600,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /cache/skia/SVG_VERSION" @@ -667,10 +615,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -686,10 +632,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, @@ -702,10 +646,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /cache/skia/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All/data" @@ -722,10 +664,8 @@ "/cache/skia/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Delete executables" @@ -737,10 +677,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect" @@ -752,10 +690,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -768,10 +704,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -801,10 +735,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect (2)" @@ -816,10 +748,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json index dbf10b83a9..ce5557efcf 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json @@ -150,11 +150,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan:[START_DIR]/clang_linux/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin" }, "name": "symbolized nanobench" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json index 867b6d7d57..30fd17a639 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json @@ -151,12 +151,10 @@ "cwd": "[START_DIR]/skia", "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json index 9c6f43b08b..bd783229ba 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu14-Clang-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs.json @@ -151,10 +151,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized nanobench" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 316f110157..f315066bd3 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "hotplug" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to hotplug", @@ -642,10 +594,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -673,10 +623,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -689,10 +637,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -731,10 +677,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -747,10 +691,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -781,10 +723,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index f389315911..018b07fa07 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -598,10 +552,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -629,10 +581,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -645,10 +595,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -687,10 +635,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -703,10 +649,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -737,10 +681,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 9028e05d1b..eb5be8f1aa 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -651,10 +603,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -703,10 +653,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -755,10 +703,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -807,10 +753,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -851,10 +795,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -894,10 +836,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -925,10 +865,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -941,10 +879,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -983,10 +919,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -999,10 +933,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1033,10 +965,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json index 1d47308f94..67cdf5c3f4 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/6.0.2/bin/asan_device_setup" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Setting up device to run ASAN", @@ -180,10 +170,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -243,10 +231,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -262,10 +248,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -280,10 +264,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -298,10 +280,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -315,10 +295,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -350,10 +328,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -395,10 +371,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -414,10 +388,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -432,10 +404,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -450,10 +420,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -467,10 +435,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -502,10 +468,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -547,10 +511,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -566,10 +528,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -584,10 +544,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -602,10 +560,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -619,10 +575,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -654,10 +608,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -672,10 +624,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -724,10 +674,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -776,10 +724,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -828,10 +774,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -880,10 +824,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -924,10 +866,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -967,10 +907,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -998,10 +936,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -1014,10 +950,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1056,10 +990,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -1072,10 +1004,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1106,10 +1036,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index 56e6c8bc0d..5f81728344 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -642,10 +594,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -673,10 +623,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -689,10 +637,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -731,10 +677,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -747,10 +691,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -781,10 +723,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json index b1360b7b8e..f35338fdf7 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -651,10 +603,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -703,10 +653,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -747,10 +695,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -790,10 +736,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -821,10 +765,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -837,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -879,10 +819,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -895,10 +833,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -929,10 +865,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json index e18737e7cd..08128b499a 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json @@ -6,10 +6,8 @@ "\nimport os\nSSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')\nwith open(SSH_MACHINE_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromeos ip", @@ -84,10 +82,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -105,10 +101,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -126,10 +120,8 @@ "/home/chronos/user/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -150,10 +142,8 @@ "/home/chronos" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -171,10 +161,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -192,10 +180,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -260,10 +246,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -282,10 +266,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -303,10 +285,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -324,10 +304,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -412,10 +390,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -434,10 +410,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -455,10 +429,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -476,10 +448,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -564,10 +534,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -586,10 +554,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -607,10 +573,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -628,10 +592,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -737,10 +699,8 @@ "/home/chronos/user/bin/dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "chmod dm" @@ -757,10 +717,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json index 3ed5ecf38d..8d3fcbb3ac 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json @@ -151,10 +151,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json index f6cfadf8ed..82e58a6f59 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json @@ -151,11 +151,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/All.profraw", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json index ce3e0b3fa4..c234ea54ad 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack.json @@ -151,10 +151,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader.json index 1fab714692..a296b2668d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader.json @@ -151,11 +151,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/build/out/swiftshader_out", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json index 256d7e597f..2c8982f1d6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json @@ -150,11 +150,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", "TSAN_OPTIONS": "report_signal_unsafe=0" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index 565ff0fd15..e18de7b4b2 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -151,12 +151,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json index 77accbe4ed..17ab265b9c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All.json @@ -151,10 +151,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json index 59063acf70..4a971d35fe 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json @@ -146,12 +146,10 @@ ], "env": { "ASAN_OPTIONS": "symbolize=1", - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index e896d39089..2da77062d9 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -152,10 +152,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json index c9c922071a..c4e8e7d0d8 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json @@ -167,10 +167,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json index 04afb3c4a0..a1231f01a2 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-All.json @@ -145,10 +145,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json index a8666c2b3f..8017e2f8b9 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json @@ -6,10 +6,8 @@ "file.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file file.txt" @@ -48,10 +46,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -62,10 +58,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -75,10 +69,8 @@ "ios.py" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "setup_device" @@ -90,10 +82,8 @@ "[START_DIR]/build/out/Debug/dm.app" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm" @@ -105,10 +95,8 @@ "[START_DIR]/build/out/Debug/nanobench.app" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_nanobench" @@ -120,10 +108,8 @@ "resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -162,10 +148,8 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -177,10 +161,8 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -191,10 +173,8 @@ "skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm skps" @@ -205,10 +185,8 @@ "skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir skps" @@ -220,10 +198,8 @@ "skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -235,10 +211,8 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -277,10 +251,8 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -292,10 +264,8 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -306,10 +276,8 @@ "images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm images" @@ -320,10 +288,8 @@ "images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir images" @@ -335,10 +301,8 @@ "images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -350,10 +314,8 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -392,10 +354,8 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -407,10 +367,8 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -421,10 +379,8 @@ "svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm svgs" @@ -435,10 +391,8 @@ "svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir svgs" @@ -450,10 +404,8 @@ "svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -465,10 +417,8 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" @@ -482,10 +432,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, @@ -496,10 +444,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull_if_needed dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json index b8f2d88ff7..c112b2f597 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -643,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -721,10 +671,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 2)", @@ -797,10 +745,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -841,10 +787,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -916,10 +860,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -947,10 +889,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -963,10 +903,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1005,10 +943,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data" @@ -1021,10 +957,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1055,10 +989,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index 993c487a5b..b2f8850bbf 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -341,10 +317,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -359,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -377,10 +349,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -394,10 +364,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -429,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -474,10 +440,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -493,10 +457,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -511,10 +473,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -529,10 +489,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -546,10 +504,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -581,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -599,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -643,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -719,10 +669,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -763,10 +711,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -838,10 +784,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -869,10 +813,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -885,10 +827,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -927,10 +867,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data" @@ -943,10 +881,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1007,10 +943,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json index e1512570ee..40837cca07 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -107,10 +99,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -170,10 +160,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -189,10 +177,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -207,10 +193,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -225,10 +209,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -242,10 +224,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -277,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -322,10 +300,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -342,10 +318,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server after failure of 'read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION' (attempt 1)", @@ -358,10 +332,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "wait for device after failure of 'read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION' (attempt 1)", @@ -376,10 +348,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION (attempt 2)", @@ -395,10 +365,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -413,10 +381,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -431,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -448,10 +412,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -483,10 +445,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -528,10 +488,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -547,10 +505,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -565,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -583,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -600,10 +552,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -635,10 +585,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -653,10 +601,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -697,10 +643,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -773,10 +717,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -817,10 +759,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -892,10 +832,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -923,10 +861,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -939,10 +875,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -981,10 +915,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data" @@ -997,10 +929,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1031,10 +961,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json index 783b8ac6ae..e792470483 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources", @@ -109,10 +101,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)", @@ -125,10 +115,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)", @@ -144,10 +132,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 2)" @@ -161,10 +147,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -224,10 +208,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -243,10 +225,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -261,10 +241,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -279,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -296,10 +272,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -331,10 +305,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -376,10 +348,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -395,10 +365,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -413,10 +381,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -431,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -448,10 +412,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -483,10 +445,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -528,10 +488,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -547,10 +505,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -565,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -583,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -600,10 +552,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -635,10 +585,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -653,10 +601,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -697,10 +643,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -773,10 +717,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -817,10 +759,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -892,10 +832,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -923,10 +861,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -939,10 +875,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -981,10 +915,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data" @@ -997,10 +929,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1031,10 +961,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json index 393c3a33c1..3de05327a6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json @@ -8,10 +8,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push file.txt file.txt" @@ -54,10 +52,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -72,10 +68,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -90,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources", @@ -109,10 +101,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)", @@ -125,10 +115,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)", @@ -144,10 +132,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 2)", @@ -163,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 2)", @@ -179,10 +163,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 2)", @@ -198,10 +180,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 3)", @@ -218,10 +198,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -280,10 +258,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json index 443b715932..dd80f9660d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json @@ -6,10 +6,8 @@ "file.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file file.txt" @@ -48,10 +46,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -62,10 +58,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -75,10 +69,8 @@ "ios.py" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "setup_device" @@ -90,10 +82,8 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm", @@ -109,10 +99,8 @@ "com.google.dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "uninstall_dm" @@ -124,10 +112,8 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm (attempt 2)" @@ -139,10 +125,8 @@ "[START_DIR]/build/out/Release/nanobench.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_nanobench" @@ -154,10 +138,8 @@ "resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -196,10 +178,8 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -211,10 +191,8 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -225,10 +203,8 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm skps" @@ -239,10 +215,8 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir skps" @@ -254,10 +228,8 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -269,10 +241,8 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -311,10 +281,8 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -326,10 +294,8 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -340,10 +306,8 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm images" @@ -354,10 +318,8 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir images" @@ -369,10 +331,8 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -384,10 +344,8 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -426,10 +384,8 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -441,10 +397,8 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -455,10 +409,8 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm svgs" @@ -469,10 +421,8 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir svgs" @@ -484,10 +434,8 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -499,10 +447,8 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" @@ -516,10 +462,8 @@ "--some-flag" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, @@ -530,10 +474,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull_if_needed dm" diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json index 175933b650..6633aa7967 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json @@ -6,10 +6,8 @@ "file.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file file.txt" @@ -48,10 +46,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm device_results_dir" @@ -62,10 +58,8 @@ "device_results_dir" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir device_results_dir" @@ -75,10 +69,8 @@ "ios.py" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "setup_device" @@ -90,10 +82,8 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm", @@ -109,10 +99,8 @@ "com.google.dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "uninstall_dm" @@ -124,10 +112,8 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm (attempt 2)", diff --git a/infra/bots/recipe_modules/infra/examples/full.expected/failed_all_updates.json b/infra/bots/recipe_modules/infra/examples/full.expected/failed_all_updates.json index d6057f2b40..3fb639441d 100644 --- a/infra/bots/recipe_modules/infra/examples/full.expected/failed_all_updates.json +++ b/infra/bots/recipe_modules/infra/examples/full.expected/failed_all_updates.json @@ -5,12 +5,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -20,12 +18,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -38,12 +34,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs", "~followup_annotations": [ @@ -60,12 +54,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 2)", "~followup_annotations": [ @@ -82,12 +74,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 3)", "~followup_annotations": [ @@ -104,12 +94,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 4)", "~followup_annotations": [ @@ -126,12 +114,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 5)", "~followup_annotations": [ diff --git a/infra/bots/recipe_modules/infra/examples/full.expected/failed_one_update.json b/infra/bots/recipe_modules/infra/examples/full.expected/failed_one_update.json index 99966e351a..7e66698eb7 100644 --- a/infra/bots/recipe_modules/infra/examples/full.expected/failed_one_update.json +++ b/infra/bots/recipe_modules/infra/examples/full.expected/failed_one_update.json @@ -5,12 +5,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -20,12 +18,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -38,12 +34,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs", "~followup_annotations": [ @@ -60,12 +54,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 2)" }, diff --git a/infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json b/infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json index 6c88554a9c..f8e6666899 100644 --- a/infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json +++ b/infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json @@ -5,12 +5,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -20,12 +18,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -38,12 +34,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json index 127080ee7f..b7c5991c21 100644 --- a/infra/bots/recipe_modules/run/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json @@ -4,10 +4,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fail", "~followup_annotations": [ @@ -20,10 +18,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fail again", "~followup_annotations": [ @@ -37,10 +33,8 @@ "do the thing" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "do a thing" }, @@ -50,10 +44,8 @@ "0" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "run 0" }, @@ -117,10 +109,8 @@ "env" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": "mydir::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": "mydir::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env" }, @@ -129,10 +119,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry fail", "~followup_annotations": [ @@ -146,10 +134,8 @@ "between_attempt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "between_attempts #1" }, @@ -158,10 +144,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry fail (attempt 2)", "~followup_annotations": [ @@ -175,10 +159,8 @@ "between_attempt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "between_attempts #2" }, @@ -187,10 +169,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry fail (attempt 3)", "~followup_annotations": [ @@ -204,10 +184,8 @@ "between_attempt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "between_attempts #3" }, @@ -216,10 +194,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry fail (attempt 4)", "~followup_annotations": [ @@ -233,10 +209,8 @@ "between_attempt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "between_attempts #4" }, @@ -245,10 +219,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry fail (attempt 5)", "~followup_annotations": [ @@ -261,10 +233,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry success", "~followup_annotations": [ @@ -278,10 +248,8 @@ "between_attempt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "between_attempts #1 (2)" }, @@ -290,10 +258,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry success (attempt 2)", "~followup_annotations": [ @@ -307,10 +273,8 @@ "between_attempt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "between_attempts #2 (2)" }, @@ -319,10 +283,8 @@ "false" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "retry success (attempt 3)" }, diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 822635a8bb..e7471089b3 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -128,9 +128,6 @@ class SkiaVarsApi(recipe_api.RecipeApi): else: self.extra_tokens = self.builder_cfg['extra_config'].split('_') - self.default_env.update({'SKIA_OUT': self.skia_out, - 'BUILDTYPE': self.configuration}) - self.patch_storage = self.m.properties.get('patch_storage', 'gerrit') self.issue = None self.patchset = None diff --git a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json index eead16ebe1..b4f9ceb301 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -151,12 +145,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Extract all fiddles out of md files" }, @@ -172,12 +164,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Force fiddle to compile all examples" }, @@ -208,12 +198,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Output fiddleout.json" }, @@ -228,12 +216,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Generate and Upload Markdown files" }, diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json index 9ffbb61ade..ee67b33dc8 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -151,12 +145,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Extract all fiddles out of md files", "~followup_annotations": [ diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json index 2774b50b61..f67a4ccae8 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -151,12 +145,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Extract all fiddles out of md files" }, @@ -172,12 +164,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Force fiddle to compile all examples", "~followup_annotations": [ diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json index 9fab0f5ddc..9bd1344802 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -151,12 +145,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Extract all fiddles out of md files" }, @@ -172,12 +164,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Force fiddle to compile all examples" }, @@ -208,12 +198,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Output fiddleout.json" }, diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json index 60ccebe788..4f6395d246 100644 --- a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json +++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -151,12 +145,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Extract all fiddles out of md files" }, @@ -172,12 +164,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Force fiddle to compile all examples" }, @@ -192,12 +182,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Generate and Upload Markdown files", "~followup_annotations": [ diff --git a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json index 3a0e4aa58e..6dae896929 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -150,12 +144,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Validate docs match include/core/*.h" }, diff --git a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json index f15a9ef22b..60f111d728 100644 --- a/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json +++ b/infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/fiddle/go/fiddlecli" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go get fiddlecli" }, @@ -150,12 +144,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Validate docs match include/core/*.h", "~followup_annotations": [ diff --git a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json index a61a89ccc0..8a4e97b4d3 100644 --- a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json @@ -120,10 +120,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Run calmbench" }, diff --git a/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json b/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json index eafa9fcc58..c53880ba1a 100644 --- a/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json +++ b/infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json @@ -120,10 +120,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Run calmbench" }, diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index af5f08e271..88592a6387 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "git diff #1", "stdout": "/path/to/tmp/" @@ -132,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "touch fp files", "~followup_annotations": [ @@ -159,10 +155,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -175,10 +169,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-clang-format" @@ -192,10 +184,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -209,10 +199,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/cache/work/skia/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, @@ -224,10 +212,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "git diff #2", "stdout": "/path/to/tmp/" @@ -240,10 +226,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "compare diffs", "~followup_annotations": [ diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json index 63f91a1798..7cd24477a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm-Release-Chromebook_GLES.json @@ -130,11 +130,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -148,11 +146,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -168,11 +164,9 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/armhf_sysroot/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json index 52ff1fc64d..b94dbda213 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json index a5cbb7daf2..642048321e 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_ASAN.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json index 51bc27fe4d..ba4cda5e5d 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json index 645c611e93..9867750707 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-ASAN.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-ASAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json index b0cb3c0ca5..0a905a4467 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-Coverage.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json index 6b6f2a7995..9e141779dd 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 0d3e4d6541..a436215044 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json index 7c89f14a8d..73c03af0a9 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Debug.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json index 6d89abbe23..a70c7b0e5b 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -166,10 +162,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json index 4a14747811..b36cf071ec 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Fast.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Fast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json index 9ee3575688..c0754144b5 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Mini.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Mini" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json index ca56b2f54f..d6d8114f0e 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json @@ -101,10 +101,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -118,10 +116,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -135,10 +131,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json index 69875da65e..b23b5eeef9 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json index f7a9009a92..f048a8f3eb 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan_Coverage" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json b/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json index 6588ea951e..d616abc485 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-EMCC-wasm-Release.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-EMCC-wasm-Release" + "PATH": "[START_DIR]/emscripten_sdk/clang/fastcomp/build_incoming_64/bin::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json index 77a263a88e..0364b74986 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-arm-Release-Chromecast.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -166,10 +162,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-arm-Release-Chromecast" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json index 6d56b1e3c4..66a8c8470e 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86-Debug.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86-Debug" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json index ae46cccc10..ac3e11973a 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Debug-NoGPU.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Debug-NoGPU" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index fec3dc6ca9..149767c81d 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json index b264bf48ee..4c08b3c122 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json @@ -160,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/flutter/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn_gen" }, @@ -176,10 +174,8 @@ ], "cwd": "[START_DIR]/cache/work/flutter/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "build_flutter" }, diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json index d76d9122c9..20bc1df71d 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Shared.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Debian9-GCC-x86_64-Release-Shared" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index 258c3bb0ad..3bc5cd2eba 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 360833c5a9..93a99f7604 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index cdf9300494..6c74e1d6b1 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x64-Release-iOS" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 80082a2bf9..4a7de747cd 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -140,10 +140,8 @@ "--make-output-dir" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "build command_buffer" }, @@ -155,10 +153,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -172,10 +168,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -189,10 +183,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index 86d5d6318b..331b57ea14 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -116,10 +116,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -133,10 +131,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,10 +146,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Release" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index f2366fc4ad..a6bef7f183 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json index edd1a5eac5..9304c6462b 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index c0f11ddb2e..24fe5c2aa9 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json index 3182b0383e..cfee31db61 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-ANGLE" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json index b6c7325920..d29e6c6930 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86_64-Release-Vulkan.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]\\cache\\work\\skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 1aee5756f2..f48008ccb6 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -130,10 +130,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index f9863c441a..dcae0506d8 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -164,10 +164,8 @@ ], "cwd": "[START_DIR]/cache/work/flutter/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn_gen" }, @@ -180,10 +178,8 @@ ], "cwd": "[START_DIR]/cache/work/flutter/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "build_flutter" }, diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 794baf0895..7461e5da78 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -134,10 +134,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -151,10 +149,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -168,10 +164,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 551554f81e..92b7b1aacd 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index de43f2dba3..3d46c3b42d 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index b13bee0509..779d0c8388 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 27a865201e..d0e757d0e4 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -134,10 +134,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -151,10 +149,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -168,10 +164,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index ec2d97d55d..7e3dd34d10 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 03368f5213..f6f88666e3 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 6104882393..3a14dbb0bc 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 651ff14872..1634df0078 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 34d114203a..ac40ba1a34 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index a1c287dc39..154e508a35 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 288767f981..28e2fd1533 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -130,10 +130,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -147,10 +145,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -164,10 +160,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index d2031fdc30..232faa85bf 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -134,10 +134,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" @@ -151,10 +149,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -168,10 +164,8 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index c9a214fafd..2863e42c9b 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -143,10 +143,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "generate binary size data" }, diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index 099d0a74f7..ccc1ff38b5 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -115,10 +115,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "generate and upload doxygen" }, @@ -151,10 +149,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "generate binary size data" }, diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index c8086c0234..9cb298fedc 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs", "~followup_annotations": [ @@ -154,12 +148,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 2)", "~followup_annotations": [ @@ -176,12 +168,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 3)", "~followup_annotations": [ @@ -198,12 +188,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 4)", "~followup_annotations": [ @@ -220,12 +208,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 5)", "~followup_annotations": [ diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index 9a53e59043..9bc49de18e 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs", "~followup_annotations": [ @@ -154,12 +148,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs (attempt 2)" }, diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index 7464a16695..b5831fbd78 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.json @@ -99,12 +99,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -114,12 +112,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -132,12 +128,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json index 574f5a5dbd..5484ac6959 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -560,10 +520,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -580,10 +538,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -597,10 +553,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -613,10 +567,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -630,10 +582,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -660,10 +610,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -694,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json index 8ee2e7335a..306a5ddfc8 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -605,10 +563,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -680,10 +636,8 @@ "450000000" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Lock GPU to 450000000 (and other perf tweaks)", @@ -744,10 +698,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -764,10 +716,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -781,10 +731,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -797,10 +745,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -814,10 +760,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -844,10 +788,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -878,10 +820,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json index 15d1310e50..eca309caea 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to userspace", @@ -641,10 +595,8 @@ "4" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000", @@ -717,10 +669,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 0", @@ -769,10 +719,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 1", @@ -821,10 +769,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 2", @@ -873,10 +819,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 3", @@ -924,10 +868,8 @@ "600000000" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Lock GPU to 600000000 (and other perf tweaks)", @@ -988,10 +930,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -1008,10 +948,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -1025,10 +963,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -1041,10 +977,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1058,10 +992,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -1104,10 +1036,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" @@ -1120,10 +1050,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1154,10 +1082,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index f41b13f6d8..2265ce34ae 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -641,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -716,10 +668,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -736,10 +686,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -753,10 +701,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -769,10 +715,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -786,10 +730,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -832,10 +774,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android/data" @@ -848,10 +788,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -882,10 +820,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json index 03a24e8fc5..3fb1b55235 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -641,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -716,10 +668,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -736,10 +686,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -753,10 +701,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -769,10 +715,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -786,10 +730,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -832,10 +774,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android/data" @@ -848,10 +788,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -882,10 +820,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json index e9776a163a..9b62c8e988 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -641,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -717,10 +669,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -761,10 +711,8 @@ "2" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -836,10 +784,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -856,10 +802,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -873,10 +817,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -889,10 +831,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -906,10 +846,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -952,10 +890,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android/data" @@ -968,10 +904,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1002,10 +936,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index 0d16c1a553..ef9b7a2823 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -641,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -717,10 +669,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -761,10 +711,8 @@ "2" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -836,10 +784,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -856,10 +802,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -873,10 +817,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -889,10 +831,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -906,10 +846,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -952,10 +890,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan/data" @@ -968,10 +904,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1002,10 +936,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json index 676efd7caa..3c25a08005 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -641,10 +595,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -717,10 +669,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 0", @@ -769,10 +719,8 @@ "0" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Disabling CPU 1", @@ -820,10 +768,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -840,10 +786,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -857,10 +801,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -873,10 +815,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -890,10 +830,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -936,10 +874,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench/data" @@ -952,10 +888,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -986,10 +920,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json index c73d940d1b..0efce55ed1 100644 --- a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json @@ -21,10 +21,8 @@ "\nimport os\nSSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')\nwith open(SSH_MACHINE_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromeos ip", @@ -51,10 +49,8 @@ "/home/chronos/user/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -75,10 +71,8 @@ "/home/chronos" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -96,10 +90,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -117,10 +109,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -185,10 +175,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -207,10 +195,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -228,10 +214,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -249,10 +233,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -337,10 +319,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -359,10 +339,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -380,10 +358,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -401,10 +377,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -489,10 +463,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -511,10 +483,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -532,10 +502,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -553,10 +521,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -614,10 +580,8 @@ "/home/chronos/user/perf" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/perf" @@ -635,10 +599,8 @@ "/home/chronos/user/perf" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/perf" @@ -682,10 +644,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rmtree data" @@ -703,10 +663,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All/data" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "makedirs data" @@ -720,10 +678,8 @@ "foo@127.0.0.1:/home/chronos/user/bin/nanobench" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "scp [START_DIR]/build/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench", @@ -750,10 +706,8 @@ "/home/chronos/user/bin/nanobench" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "chmod nanobench" @@ -829,10 +783,8 @@ "ChromeOS" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json index 60a31dcb69..f463cc13f8 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json @@ -21,10 +21,8 @@ "\nimport os\nCHROMECAST_IP_FILE = os.path.expanduser('~/chromecast.txt')\nwith open(CHROMECAST_IP_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromecast ip", @@ -45,10 +43,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -63,10 +59,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -81,10 +75,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -98,10 +90,8 @@ "/cache/skia/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -164,10 +154,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -183,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -201,10 +187,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -219,10 +203,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -236,10 +218,8 @@ "/cache/skia/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -274,10 +254,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -319,10 +297,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -356,10 +332,8 @@ "~shapes_rrect_inner_rrect_50_500x500" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, @@ -375,10 +349,8 @@ "/cache/skia/bin" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Delete executables" @@ -390,10 +362,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect" @@ -405,10 +375,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -421,10 +389,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -454,10 +420,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect (2)" @@ -469,10 +433,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 4447891901..4a395052d9 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -21,10 +21,8 @@ "\nimport os\nCHROMECAST_IP_FILE = os.path.expanduser('~/chromecast.txt')\nwith open(CHROMECAST_IP_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromecast ip", @@ -45,10 +43,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -63,10 +59,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -81,10 +75,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -98,10 +90,8 @@ "/cache/skia/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -164,10 +154,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -183,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -201,10 +187,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -219,10 +203,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -236,10 +218,8 @@ "/cache/skia/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -274,10 +254,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -292,10 +270,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/perf" @@ -310,10 +286,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/perf" @@ -355,10 +329,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -414,10 +386,8 @@ "Chromecast" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, @@ -445,10 +415,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /cache/skia/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All/data" @@ -465,10 +433,8 @@ "/cache/skia/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Delete executables" @@ -480,10 +446,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect" @@ -495,10 +459,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -511,10 +473,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -544,10 +504,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect (2)" @@ -559,10 +517,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index b8f45e1779..fd94a68a50 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -177,12 +177,10 @@ "cwd": "[START_DIR]/skia", "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json index 16d633bace..0d000567e9 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json @@ -226,10 +226,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json index d62c935c98..0a9cace4bf 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json @@ -185,12 +185,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index f6b395fc6c..f2bf2c0d92 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -175,12 +175,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json index 41baba11f6..b229366d2f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json @@ -228,12 +228,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json" }, "name": "symbolized nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json index 1283646a10..99b6cfb751 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json @@ -219,10 +219,8 @@ "Mac" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json index 363f6f0aea..c10dcc8055 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json @@ -221,10 +221,8 @@ "Mac" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json index 556f0fa27e..74cdb7fbaa 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All.json @@ -220,10 +220,8 @@ "Mac" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index d872555cf5..61dbf1b5bb 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -184,10 +184,8 @@ "--abandonGpuContext" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index e36cd86e07..e6b747bf49 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -183,10 +183,8 @@ "~inc1.webp" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "nanobench" diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json index ad7298685c..defd44d220 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json @@ -222,10 +222,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json index ae5af1abcf..ac4cbf444b 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json @@ -222,10 +222,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json index 77765afb54..bc3730ae9a 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json @@ -224,10 +224,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json index 8980334db7..854a208311 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json @@ -222,10 +222,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json index 034c8ea5a0..720b3d72e9 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json @@ -240,10 +240,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json index 3ae8d03704..aa4a9ceff1 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json @@ -222,10 +222,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json index 7655074584..d7e97e016a 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Debug-All.json @@ -170,10 +170,8 @@ "~inc1.webp" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json index 2f03011631..fce45d3fa6 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All.json @@ -220,10 +220,8 @@ "Win2016" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json index 9d5697e680..ca0ebfb873 100644 --- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json @@ -19,12 +19,10 @@ "ios.py" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "setup_device" @@ -36,12 +34,10 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm" @@ -53,12 +49,10 @@ "[START_DIR]/build/out/Release/nanobench.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_nanobench" @@ -70,12 +64,10 @@ "resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -122,12 +114,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -139,12 +129,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -155,12 +143,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm skps" @@ -171,12 +157,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir skps" @@ -188,12 +172,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -205,12 +187,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -257,12 +237,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -274,12 +252,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -290,12 +266,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm images" @@ -306,12 +280,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir images" @@ -323,12 +295,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -340,12 +310,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -392,12 +360,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -409,12 +375,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -425,12 +389,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm svgs" @@ -441,12 +403,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir svgs" @@ -458,12 +418,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -475,12 +433,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" @@ -491,12 +447,10 @@ "perf" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm perf" @@ -507,12 +461,10 @@ "perf" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir perf" @@ -630,12 +582,10 @@ "iOS" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, @@ -665,12 +615,10 @@ "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All/data" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull_if_needed perf" diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed.json b/infra/bots/recipes/perf.expected/cpu_scale_failed.json index c0684b5201..81040578bb 100644 --- a/infra/bots/recipes/perf.expected/cpu_scale_failed.json +++ b/infra/bots/recipes/perf.expected/cpu_scale_failed.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -605,10 +563,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -683,10 +639,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 2)", @@ -761,10 +715,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 3)", @@ -837,10 +789,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -885,10 +835,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json b/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json index 1df1cb5ffe..c70727a217 100644 --- a/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json +++ b/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -533,10 +493,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/perf" @@ -551,10 +509,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" @@ -597,10 +553,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to userspace", @@ -641,10 +595,8 @@ "4" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000", @@ -719,10 +671,8 @@ "4" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000 (attempt 2)", @@ -797,10 +747,8 @@ "4" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 4 to 0.600000 (attempt 3)", @@ -889,10 +837,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/perf [START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android/data" @@ -905,10 +851,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -953,10 +897,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json b/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json index 2b47c844ae..92b75dcdc6 100644 --- a/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json +++ b/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to userspace", @@ -605,10 +563,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000", @@ -683,10 +639,8 @@ "0" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 0 to 0.600000 (attempt 2)", @@ -759,10 +713,8 @@ "userspace" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to userspace", @@ -803,10 +755,8 @@ "2" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Scale CPU 2 to 0.600000", @@ -878,10 +828,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench" @@ -898,10 +846,8 @@ "[START_DIR]/tmp/nanobench.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write nanobench.sh" @@ -915,10 +861,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push nanobench.sh" @@ -931,10 +875,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -948,10 +890,8 @@ "nanobench.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench", "~followup_annotations": [ @@ -978,10 +918,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1012,10 +950,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/failed_push.json b/infra/bots/recipes/perf.expected/failed_push.json index 9116387a02..7aaaf46d7a 100644 --- a/infra/bots/recipes/perf.expected/failed_push.json +++ b/infra/bots/recipes/perf.expected/failed_push.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -77,10 +73,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -139,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json index a18ae9879c..f57f2244c3 100644 --- a/infra/bots/recipes/perf.expected/trybot.json +++ b/infra/bots/recipes/perf.expected/trybot.json @@ -226,10 +226,8 @@ "Win10" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "nanobench" }, diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index ebffee4f5d..aacd040b0f 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -134,12 +134,10 @@ ], "cwd": "[START_DIR]/cache/work/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "GN" }, @@ -152,10 +150,8 @@ ], "cwd": "[START_DIR]/cache/work/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Build Chrome" }, @@ -200,10 +196,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Recreate SKPs" }, diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index c7166800e6..71ccfc6d17 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -134,12 +134,10 @@ ], "cwd": "[START_DIR]/cache/work/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "GN" }, @@ -152,10 +150,8 @@ ], "cwd": "[START_DIR]/cache/work/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Build Chrome" }, @@ -200,10 +196,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Recreate SKPs" }, @@ -213,12 +207,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -228,12 +220,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -246,12 +236,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs" }, @@ -264,12 +252,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Upload SKPs" }, diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index fa7ad45e70..9cb8de52d9 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -134,12 +134,10 @@ ], "cwd": "[START_DIR]/cache/work/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "GYP_GENERATORS": "ninja", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "GN" }, @@ -152,10 +150,8 @@ ], "cwd": "[START_DIR]/cache/work/src", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Build Chrome" }, @@ -200,10 +196,8 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Recreate SKPs" }, @@ -213,12 +207,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "go version" }, @@ -228,12 +220,10 @@ "version" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "env go version" }, @@ -246,12 +236,10 @@ "go.skia.org/infra/..." ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "update go pkgs" }, @@ -264,12 +252,10 @@ ], "cwd": "[START_DIR]/cache/work/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GOPATH": "[START_DIR]/gopath", "GOROOT": "[START_DIR]/go/go", - "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath::RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Upload SKPs", "~followup_annotations": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json index 765af36b7a..29a22b965b 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -69,10 +67,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -88,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -106,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -124,10 +116,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -141,10 +131,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -176,10 +164,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -208,10 +194,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push skpbench" @@ -237,10 +221,8 @@ "/sdcard/revenge_of_the_skiabot/skps/desk_chalkboard.skp" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "skpbench" }, @@ -306,10 +288,8 @@ "All" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Parse skpbench output into Perf json" }, @@ -321,10 +301,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -355,10 +333,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json index 08590085ca..0934bcd979 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -69,10 +67,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -88,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -106,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -124,10 +116,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -141,10 +131,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -176,10 +164,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -208,10 +194,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push skpbench" @@ -233,10 +217,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "skpbench" }, @@ -302,10 +284,8 @@ "All" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Parse skpbench output into Perf json" }, @@ -317,10 +297,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -351,10 +329,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json index f453f24326..72ca6adea9 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -69,10 +67,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -88,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -106,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -124,10 +116,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -141,10 +131,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -176,10 +164,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -208,10 +194,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push skpbench" @@ -233,10 +217,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "skpbench" }, @@ -302,10 +284,8 @@ "All" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Parse skpbench output into Perf json" }, @@ -317,10 +297,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -351,10 +329,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index 93b0ed0d15..8743ca946b 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -69,10 +67,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -88,10 +84,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -106,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -124,10 +116,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -141,10 +131,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -176,10 +164,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -208,10 +194,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push skpbench" @@ -233,10 +217,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "skpbench" }, @@ -308,10 +290,8 @@ "All" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "Parse skpbench output into Perf json" }, @@ -323,10 +303,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -357,10 +335,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json b/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json index 4508f91970..530fca37b9 100644 --- a/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json +++ b/infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json @@ -26,10 +26,8 @@ "[START_DIR]/out/devrel/skqp-universal-debug.apk" ], "env": { - "BUILDTYPE": "devrel", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "run firebase testlab" }, diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 71b32d2682..ae42fb2fb1 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "hotplug" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to hotplug", @@ -734,10 +684,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -754,10 +702,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -771,10 +717,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -787,10 +731,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -804,10 +746,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -835,10 +775,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -851,10 +789,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -885,10 +821,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json index d22a5e2397..a35ae75c8a 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -690,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -710,10 +660,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -727,10 +675,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -743,10 +689,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -760,10 +704,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -791,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -807,10 +747,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -841,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json index 321ebe73f6..8f04b5bc24 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -690,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -710,10 +660,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -727,10 +675,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -743,10 +689,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -760,10 +704,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -791,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -807,10 +747,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -841,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json index 68dbbe9f2a..193e4da5e3 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -690,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -710,10 +660,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -727,10 +675,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -743,10 +689,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -760,10 +704,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -791,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -807,10 +747,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -841,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json index 681e105018..5a1a31a913 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -690,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -710,10 +660,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -727,10 +675,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -743,10 +689,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -760,10 +704,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -791,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -807,10 +747,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -841,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json index 59ed210441..693f9da0f5 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -734,10 +684,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -754,10 +702,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -771,10 +717,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -787,10 +731,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -804,10 +746,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -835,10 +775,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -851,10 +789,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -885,10 +821,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN.json index 04749e6711..6794588555 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-CPU-Snapdragon808-arm-Release-All-Android_ASAN.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/6.0.2/bin/asan_device_setup" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Setting up device to run ASAN", @@ -114,10 +110,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -177,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -196,10 +188,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -214,10 +204,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -232,10 +220,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -249,10 +235,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -284,10 +268,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -329,10 +311,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -348,10 +328,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -366,10 +344,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -384,10 +360,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -401,10 +375,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -436,10 +408,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -481,10 +451,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -500,10 +468,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -518,10 +484,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -536,10 +500,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -553,10 +515,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -588,10 +548,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -634,10 +592,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -686,10 +642,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -738,10 +692,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -790,10 +742,8 @@ "1" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -842,10 +792,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -886,10 +834,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -929,10 +875,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -949,10 +893,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -966,10 +908,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -982,10 +922,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -999,10 +937,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -1029,10 +965,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1063,10 +997,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json index d8b32dffb5..5188c99aed 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/6.0.2/bin/asan_device_setup" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Setting up device to run ASAN", @@ -114,10 +110,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -177,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -196,10 +188,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -214,10 +204,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -232,10 +220,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -249,10 +235,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -284,10 +268,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -329,10 +311,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -348,10 +328,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -366,10 +344,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -384,10 +360,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -401,10 +375,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -436,10 +408,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -481,10 +451,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -500,10 +468,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -518,10 +484,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -536,10 +500,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -553,10 +515,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -588,10 +548,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -634,10 +592,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -686,10 +642,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -738,10 +692,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -790,10 +742,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -842,10 +792,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -886,10 +834,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -929,10 +875,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -949,10 +893,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -966,10 +908,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -982,10 +922,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -999,10 +937,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -1029,10 +965,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1063,10 +997,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json index 62e45988f6..0c0e4b8666 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/6.0.2/bin/asan_device_setup" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Setting up device to run ASAN", @@ -114,10 +110,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -177,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -196,10 +188,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -214,10 +204,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -232,10 +220,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -249,10 +235,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -284,10 +268,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -329,10 +311,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -348,10 +328,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -366,10 +344,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -384,10 +360,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -401,10 +375,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -436,10 +408,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -481,10 +451,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -500,10 +468,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -518,10 +484,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -536,10 +500,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -553,10 +515,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -588,10 +548,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -634,10 +592,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -686,10 +642,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -738,10 +692,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -790,10 +742,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -842,10 +792,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -886,10 +834,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -929,10 +875,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -949,10 +893,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -966,10 +908,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -982,10 +922,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -999,10 +937,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -1029,10 +965,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1063,10 +997,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json index 2b24b38099..419180208c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -743,10 +693,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -795,10 +743,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -847,10 +793,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -899,10 +843,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -943,10 +885,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -986,10 +926,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -1006,10 +944,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -1023,10 +959,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -1039,10 +973,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1056,10 +988,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -1087,10 +1017,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -1103,10 +1031,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1137,10 +1063,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index 934c7ac4ec..1e647200e6 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -734,10 +684,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -754,10 +702,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -771,10 +717,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -787,10 +731,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -804,10 +746,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -835,10 +775,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -851,10 +789,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -885,10 +821,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json index 6d3417f183..a88d7ea729 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -734,10 +684,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -754,10 +702,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -771,10 +717,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -787,10 +731,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -804,10 +746,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -835,10 +775,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -851,10 +789,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -885,10 +821,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json index d566bf90b0..99d0a84d74 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -735,10 +685,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -778,10 +726,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -798,10 +744,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -815,10 +759,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -831,10 +773,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -848,10 +788,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -879,10 +817,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -895,10 +831,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -929,10 +863,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index d0597dc770..6979bf22c2 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -735,10 +685,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -778,10 +726,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -798,10 +744,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -815,10 +759,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -831,10 +773,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -848,10 +788,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -879,10 +817,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -895,10 +831,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -929,10 +863,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json index 62ab7f0984..7e93c14a70 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -743,10 +693,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -795,10 +743,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -839,10 +785,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -882,10 +826,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -902,10 +844,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -919,10 +859,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -935,10 +873,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -952,10 +888,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -983,10 +917,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -999,10 +931,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1033,10 +963,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json index 29c45cfb1f..8092557c5c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -743,10 +693,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -795,10 +743,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 2's governor to ondemand", @@ -839,10 +785,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -882,10 +826,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -902,10 +844,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -919,10 +859,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -935,10 +873,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -952,10 +888,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -983,10 +917,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -999,10 +931,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1033,10 +963,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL1_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL1_Vulkan.json index 482c47cc55..97bdb60792 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL1_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL1_Vulkan.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -743,10 +693,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -795,10 +743,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -847,10 +793,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -899,10 +843,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -943,10 +885,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -986,10 +926,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -1006,10 +944,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -1023,10 +959,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -1039,10 +973,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1056,10 +988,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -1087,10 +1017,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -1103,10 +1031,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1137,10 +1063,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL3_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL3_Vulkan.json index 4141559934..9c5c6c0443 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL3_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_DDL3_Vulkan.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 0", @@ -743,10 +693,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 1", @@ -795,10 +743,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 2", @@ -847,10 +793,8 @@ "1" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Enabling CPU 3", @@ -899,10 +843,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 4's governor to ondemand", @@ -943,10 +885,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -986,10 +926,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -1006,10 +944,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -1023,10 +959,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -1039,10 +973,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -1056,10 +988,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -1087,10 +1017,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -1103,10 +1031,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -1137,10 +1063,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json index fb40bb9d97..d3dfb5b96a 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Debug-All.json @@ -21,10 +21,8 @@ "\nimport os\nSSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')\nwith open(SSH_MACHINE_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromeos ip", @@ -51,10 +49,8 @@ "/home/chronos/user/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -75,10 +71,8 @@ "/home/chronos" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -96,10 +90,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -117,10 +109,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -185,10 +175,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -207,10 +195,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -228,10 +214,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -249,10 +233,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -337,10 +319,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -359,10 +339,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -380,10 +358,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -401,10 +377,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -489,10 +463,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -511,10 +483,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -532,10 +502,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -553,10 +521,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -642,10 +608,8 @@ "/home/chronos/user/dm_out" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/dm_out" @@ -663,10 +627,8 @@ "/home/chronos/user/dm_out" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/dm_out" @@ -679,10 +641,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -779,10 +739,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rmtree dm" @@ -800,10 +758,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "makedirs dm" @@ -817,10 +773,8 @@ "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", @@ -847,10 +801,8 @@ "/home/chronos/user/bin/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "chmod dm" @@ -1018,10 +970,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json index 50a283cf80..3071a8a683 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json @@ -21,10 +21,8 @@ "\nimport os\nSSH_MACHINE_FILE = os.path.expanduser('~/ssh_machine.json')\nwith open(SSH_MACHINE_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromeos ip", @@ -51,10 +49,8 @@ "/home/chronos/user/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/resources" @@ -75,10 +71,8 @@ "/home/chronos" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "remount /home/chronos/user/ as exec" @@ -96,10 +90,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/bin" @@ -117,10 +109,8 @@ "/home/chronos/user/bin" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/bin" @@ -185,10 +175,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SKP_VERSION", @@ -207,10 +195,8 @@ "/home/chronos/user/SKP_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SKP_VERSION" @@ -228,10 +214,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/skps" @@ -249,10 +233,8 @@ "/home/chronos/user/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/skps" @@ -337,10 +319,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SK_IMAGE_VERSION", @@ -359,10 +339,8 @@ "/home/chronos/user/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SK_IMAGE_VERSION" @@ -380,10 +358,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/images" @@ -401,10 +377,8 @@ "/home/chronos/user/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/images" @@ -489,10 +463,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /home/chronos/user/SVG_VERSION", @@ -511,10 +483,8 @@ "/home/chronos/user/SVG_VERSION" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/SVG_VERSION" @@ -532,10 +502,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/svgs" @@ -553,10 +521,8 @@ "/home/chronos/user/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/svgs" @@ -642,10 +608,8 @@ "/home/chronos/user/dm_out" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /home/chronos/user/dm_out" @@ -663,10 +627,8 @@ "/home/chronos/user/dm_out" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /home/chronos/user/dm_out" @@ -679,10 +641,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -779,10 +739,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rmtree dm" @@ -800,10 +758,8 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "makedirs dm" @@ -817,10 +773,8 @@ "foo@127.0.0.1:/home/chronos/user/bin/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm", @@ -847,10 +801,8 @@ "/home/chronos/user/bin/dm" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "chmod dm" @@ -1020,10 +972,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json index 39aa422c64..487fd4492d 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json @@ -21,10 +21,8 @@ "\nimport os\nCHROMECAST_IP_FILE = os.path.expanduser('~/chromecast.txt')\nwith open(CHROMECAST_IP_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromecast ip", @@ -45,10 +43,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -63,10 +59,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -81,10 +75,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -98,10 +90,8 @@ "/cache/skia/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -164,10 +154,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -183,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -201,10 +187,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -219,10 +203,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -236,10 +218,8 @@ "/cache/skia/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -274,10 +254,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -320,10 +298,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -338,10 +314,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -354,10 +328,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -404,10 +376,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -449,10 +419,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -534,10 +502,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, @@ -550,10 +516,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -570,10 +534,8 @@ "/cache/skia/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Delete executables" @@ -585,10 +547,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect" @@ -600,10 +560,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -616,10 +574,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -649,10 +605,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect (2)" @@ -664,10 +618,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json index 8f9069f53a..3207780cd1 100644 --- a/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json @@ -21,10 +21,8 @@ "\nimport os\nCHROMECAST_IP_FILE = os.path.expanduser('~/chromecast.txt')\nwith open(CHROMECAST_IP_FILE, 'r') as f:\n print f.read()\n" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read chromecast ip", @@ -45,10 +43,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -63,10 +59,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -81,10 +75,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -98,10 +90,8 @@ "/cache/skia/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -164,10 +154,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -183,10 +171,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -201,10 +187,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -219,10 +203,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -236,10 +218,8 @@ "/cache/skia/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -274,10 +254,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" @@ -320,10 +298,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -338,10 +314,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -354,10 +328,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -404,10 +376,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -449,10 +419,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -641,10 +609,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, @@ -657,10 +623,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -677,10 +641,8 @@ "/cache/skia/bin" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Delete executables" @@ -692,10 +654,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect" @@ -707,10 +667,8 @@ "192.168.1.2:5555" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -723,10 +681,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -756,10 +712,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "disconnect (2)" @@ -771,10 +725,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index 84e7c288db..3fdec82e4a 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -444,12 +444,10 @@ "cwd": "[START_DIR]/skia", "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json index 1e59a27970..5fd36def78 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json @@ -440,11 +440,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan:[START_DIR]/clang_linux/lib", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index a59fcc07ec..d2435d8681 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -521,10 +519,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json index 6078ebd636..95a6882e35 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -267,10 +265,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json index edbc51d7fc..a9dc7db844 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json @@ -442,11 +442,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/shard_00_10.profraw", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json index 3c7ffd9efd..4e366e7ae1 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -269,10 +267,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader.json index 7c3095ef3f..a91e6349ac 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -271,11 +269,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/build/out/swiftshader_out", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json index bc8c070db5..a67e2f8e38 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json @@ -442,11 +442,9 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/lib", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/clang_linux/bin", - "SKIA_OUT": "[START_DIR]/build/out", "TSAN_OPTIONS": "report_signal_unsafe=0" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json index b12dcec7ea..f9bc1f1c3b 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -419,12 +417,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json index 0b7b7b8ad5..6191ec99f0 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -435,12 +433,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index 54e3bc6e42..d9e5e2cfb4 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -415,12 +413,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json index 97f1f58cf8..384035f889 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -419,12 +417,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" }, "name": "symbolized dm" diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json index cc73c5c03d..0e17a472be 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -519,10 +517,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json index 457dadced2..a454089ad9 100644 --- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -517,10 +515,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json index a989fb6ce3..da53aa5289 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -488,10 +486,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json index 0c6c7c9260..4d5ddcedc5 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -481,10 +479,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json index 24788ec4e5..73dd55b6be 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -489,10 +487,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json index 95a9dfcdbb..ed172772fb 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -587,10 +585,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json index 3e91f32c8a..73179e8864 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -484,10 +482,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json index 9f72c8cdf0..18b140da49 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -374,10 +372,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json index 7514145396..71d88389de 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -373,10 +371,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json index ebd9a5aa98..f96dae463c 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json @@ -292,12 +292,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib", "LLVM_PROFILE_FILE": "[START_DIR]/[SWARM_OUT_DIR]/All.profraw", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin" }, "name": "symbolized dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 0b088f1035..c3b9657565 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -307,10 +307,8 @@ "--abandonGpuContext" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 08e588eb95..2a0246ddb4 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -308,10 +308,8 @@ "--preAbandonGpuContext" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index eb8f89f4fb..18520158c4 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -306,10 +306,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out", "VALGRIND_LIB": "[START_DIR]/valgrind/lib/valgrind" }, "name": "dm" diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json index 4929de71c9..4ec7af3d3b 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -418,10 +416,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json index b0d7371e6c..212d705167 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -410,10 +408,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json index b4a5243ae5..da67ec1bc4 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -418,10 +416,8 @@ "--releaseAndAbandonGpuContext" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json index a690608847..db8730677a 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -314,10 +312,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json index 266acaebf6..550530d019 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts_GDI.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -315,10 +313,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json index f766da77da..8a416c159f 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -487,10 +485,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json index 0a0b9535c1..066778bb08 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -570,10 +568,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json index 002d2b3bf1..dd205f6ece 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -419,10 +417,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json index a1bb90985f..f4ccefbab0 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -410,10 +408,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json index 656754a205..77aac3c6e0 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -420,10 +418,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json index 675d4f1b3b..ec7b8d4d65 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -410,10 +408,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json index 1ec631a29a..a3cbe85ba8 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -416,10 +414,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json index d5f464e53d..705d316702 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -329,10 +327,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json index 57bbf513cd..c2f7b6b9ab 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -328,10 +326,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json index 4a7a315422..ff6b9dce22 100644 --- a/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json +++ b/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -330,10 +328,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json index d67e8e12db..ed8dc14c5c 100644 --- a/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All.json @@ -134,10 +134,8 @@ "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -625,10 +623,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]\\build\\out" + "PATH": ";RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json index c2b89431d2..ec28b61cd1 100644 --- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json +++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json @@ -19,12 +19,10 @@ "ios.py" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "setup_device" @@ -36,12 +34,10 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm" @@ -53,12 +49,10 @@ "[START_DIR]/build/out/Release/nanobench.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_nanobench" @@ -70,12 +64,10 @@ "resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -122,12 +114,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -139,12 +129,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -155,12 +143,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm skps" @@ -171,12 +157,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir skps" @@ -188,12 +172,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -205,12 +187,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -257,12 +237,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -274,12 +252,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -290,12 +266,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm images" @@ -306,12 +280,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir images" @@ -323,12 +295,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -340,12 +310,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -392,12 +360,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -409,12 +375,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -425,12 +389,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm svgs" @@ -441,12 +403,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir svgs" @@ -458,12 +418,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -475,12 +433,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" @@ -527,12 +483,10 @@ "dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm dm" @@ -543,12 +497,10 @@ "dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir dm" @@ -561,12 +513,10 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -611,12 +561,10 @@ "tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt" @@ -941,12 +889,10 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, @@ -957,12 +903,10 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull_if_needed dm" diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 12719c887b..c858ac4080 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -517,10 +515,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "symbolized dm", "~followup_annotations": [ diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index 368cddbaba..5a0ad35d3e 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -647,10 +601,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -693,10 +645,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -736,10 +686,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -756,10 +704,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -773,10 +719,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -789,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -806,10 +748,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -837,10 +777,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -853,10 +791,8 @@ "[START_DIR]/build/out/Release" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -887,10 +823,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index 04569eaafa..5a647ef2e6 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -691,10 +643,8 @@ "ondemand" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "Set CPU 0's governor to ondemand", @@ -734,10 +684,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -754,10 +702,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -771,10 +717,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -787,10 +731,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -804,10 +746,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -837,10 +777,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm", @@ -857,10 +795,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -891,10 +827,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json index 88d6db4576..508d2e3831 100644 --- a/infra/bots/recipes/test.expected/failed_push.json +++ b/infra/bots/recipes/test.expected/failed_push.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -77,10 +73,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -139,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json index 6fa8590437..7cb5f9622a 100644 --- a/infra/bots/recipes/test.expected/internal_bot_1.json +++ b/infra/bots/recipes/test.expected/internal_bot_1.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -690,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -710,10 +660,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -727,10 +675,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -743,10 +689,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -760,10 +704,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -791,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -807,10 +747,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -841,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json index 0c6674f7d7..ba79be82c1 100644 --- a/infra/bots/recipes/test.expected/internal_bot_2.json +++ b/infra/bots/recipes/test.expected/internal_bot_2.json @@ -24,10 +24,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -41,10 +39,8 @@ "/sdcard/revenge_of_the_skiabot/resources" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -104,10 +100,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -123,10 +117,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -141,10 +133,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -159,10 +149,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -176,10 +164,8 @@ "/sdcard/revenge_of_the_skiabot/skps" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -211,10 +197,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -256,10 +240,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -275,10 +257,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -293,10 +273,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -311,10 +289,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -328,10 +304,8 @@ "/sdcard/revenge_of_the_skiabot/images" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -363,10 +337,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -408,10 +380,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -427,10 +397,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -445,10 +413,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -463,10 +429,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -480,10 +444,8 @@ "/sdcard/revenge_of_the_skiabot/svgs" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -515,10 +477,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -561,10 +521,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -579,10 +537,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -595,10 +551,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -645,10 +599,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -690,10 +642,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm" @@ -710,10 +660,8 @@ "[START_DIR]/tmp/dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "write dm.sh" @@ -727,10 +675,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push dm.sh" @@ -743,10 +689,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "clear log" @@ -760,10 +704,8 @@ "dm.sh" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm", "~followup_annotations": [ @@ -791,10 +733,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" @@ -807,10 +747,8 @@ "[START_DIR]/build/out/Debug" ], "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "dump log", @@ -841,10 +779,8 @@ ], "cwd": "[START_DIR]/skia", "env": { - "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "kill adb server" diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index 8514aaec39..a119711f8a 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -134,10 +134,8 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -577,10 +575,8 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, diff --git a/platform_tools/android/bin/android_perf b/platform_tools/android/bin/android_perf index 0d1d5e2e39..43285f044e 100755 --- a/platform_tools/android/bin/android_perf +++ b/platform_tools/android/bin/android_perf @@ -38,7 +38,7 @@ perf_setup() { adb_pull_if_needed /system/lib/libm.so $TMP_SYS_LIB adb_pull_if_needed /system/lib/libz.so $TMP_SYS_LIB - # BUILDTYPE variable is set by android_setup.sh + # SKIA_OUT variable is set by android_setup.sh if [ ! -f "${SKIA_OUT}/${runVars[0]}" ]; then echo "Unable to find the ${runVars[0]} executable" diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh index 265cadfedf..0490980346 100755 --- a/platform_tools/ios/bin/ios_setup.sh +++ b/platform_tools/ios/bin/ios_setup.sh @@ -28,16 +28,6 @@ CODE_SIGN_IDENTITY="iPhone Developer" IOS_RESULTS_DIR="results" -# BUILDTYPE is 'Debug' by default. -if [[ -z "$BUILDTYPE" ]]; then - BUILDTYPE="Debug" -fi - -# Out dir is $SKIA_SRC_DIR/out by default. -if [[ -z "$SKIA_OUT" ]]; then - SKIA_OUT="$SKIA_SRC_DIR/out" -fi - # Location of XCode build products. if [[ -z "$XCODEBUILD" ]]; then XCODEBUILD="${SKIA_SRC_DIR}/xcodebuild" -- cgit v1.2.3