From bd2e1f1ca6f511e567020bebd7479cade8e246a1 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 17 Apr 2018 11:28:46 +0000 Subject: Revert "Reland "[infra] Run recipes through Kitchen"" This reverts commit f39bbe5a31542396a8aabf8066ee46862312d7d8. Reason for revert: Broke lots of bots Original change's description: > Reland "[infra] Run recipes through Kitchen" > > Bug: skia:7050 > Change-Id: I331014c408dd5b6f7baafd78ffd12f1235c5bfe7 > Reviewed-on: https://skia-review.googlesource.com/121481 > Commit-Queue: Eric Boren > Reviewed-by: Ben Wagner > Reviewed-by: Ravi Mistry TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com Change-Id: I4548c66a9cb0b4f105e2bc3b1c7185d14549172f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7050 Reviewed-on: https://skia-review.googlesource.com/121463 Reviewed-by: Eric Boren Commit-Queue: Eric Boren --- .../housekeeper.expected/Housekeeper-PerCommit-Trybot.json | 8 ++++---- .../recipes/housekeeper.expected/Housekeeper-PerCommit.json | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'infra/bots/recipes/housekeeper.expected') diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 161047a5db..7d57a29557 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -122,7 +122,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "infra_step": true, @@ -133,11 +133,11 @@ "python", "RECIPE_MODULE[skia::core]/resources/run_binary_size_analysis.py", "--library", - "[START_DIR]/build/out/Release/libskia.so", + "[START_DIR]/out/Release/libskia.so", "--githash", "abc123", "--dest", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json", + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json", "--issue_number", "456789" ], @@ -146,7 +146,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "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 c7cfb77fc2..f9b13d8a7b 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -118,7 +118,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate and upload doxygen" }, @@ -132,7 +132,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "infra_step": true, @@ -143,18 +143,18 @@ "python", "RECIPE_MODULE[skia::core]/resources/run_binary_size_analysis.py", "--library", - "[START_DIR]/build/out/Release/libskia.so", + "[START_DIR]/out/Release/libskia.so", "--githash", "abc123", "--dest", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json" + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Housekeeper-PerCommit/data/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1337000001.json" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate binary size data" }, -- cgit v1.2.3