diff options
author | 2016-08-03 08:23:10 -0700 | |
---|---|---|
committer | 2016-08-03 08:23:10 -0700 | |
commit | 1436a09e1fc3be4655af960d4ffb31066bfe4cdd (patch) | |
tree | e0f37f3938b2bf1dcd7a432943343839e994714c /infra/bots/recipes/swarm_trigger.expected | |
parent | 7a9f3766aa07f69323f37670a7aeb13605f266bb (diff) |
Re-organize Skia recipes
Break Skia recipe module into:
- skia_vars: defines and stores variables (eg. paths)
- skia_step: utilities for running Skia steps
- skia_flavor: flavor-specific stuff
- skia: top-level setup, checkout, test/perf steps, etc etc
This establishes a saner dependency structure for the recipes; skia_vars
is at the bottom level, skia_step depends on it, skia_flavor depends on
both of them, skia depends on all of the above, and the recipes
themselves may depend on any or all of them.
Next steps:
- Merge buildbot_spec into skia_vars
- Move test_steps and perf_steps from skia recipe_module into
swarm_test and swarm_perf recipes
- Cleaner checkout_steps process
BUG=skia:5578
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2198173002
Review-Url: https://codereview.chromium.org/2198173002
Diffstat (limited to 'infra/bots/recipes/swarm_trigger.expected')
9 files changed, 9 insertions, 9 deletions
diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json index 5d68baa509..75359f6583 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json @@ -907,7 +907,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_bench_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_bench_results.py", "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot", "5", "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot/data", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json index 9a8507fe14..cd02903df2 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json @@ -878,7 +878,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json index 953feb3a18..dcbb9bbaca 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json @@ -877,7 +877,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json index 409aadf20c..e266e8bf9a 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json @@ -868,7 +868,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index c6d06e5edd..84d2ef59b7 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -621,7 +621,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_bench_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_bench_results.py", "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot", "5", "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index 97a49aa7c7..fbe10be824 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -864,7 +864,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json index 97c64a6501..97be43115a 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json @@ -873,7 +873,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json index d3ad377f13..fae8ed8aae 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json @@ -876,7 +876,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json index bdaf37a74d..88eb30b16d 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json @@ -867,7 +867,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::skia]/resources/upload_dm_results.py", + "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py", "[SLAVE_BUILD]/dm", "abc123", "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release", |