From 7bbb26fee0dcd7c53c1f5b80f62966654dd823ba Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Mon, 16 Apr 2018 07:44:41 -0400 Subject: [infra] Run recipes through Kitchen Bug: skia:7050 Change-Id: I50632444eb4ca7f9ae2b1b30b766e531092ccad4 Reviewed-on: https://skia-review.googlesource.com/82500 Commit-Queue: Eric Boren Reviewed-by: Ravi Mistry --- ...-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json | 84 ++++++++++++++-------- 1 file changed, 56 insertions(+), 28 deletions(-) (limited to 'infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json') 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 1fbe113a1e..376277abdf 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 @@ -9,7 +9,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read chromecast ip", @@ -33,7 +33,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555" @@ -51,7 +51,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/resources" @@ -69,7 +69,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/bin" @@ -86,7 +86,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /cache/skia/resources", @@ -152,7 +152,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "read /cache/skia/SKP_VERSION", @@ -171,7 +171,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /cache/skia/SKP_VERSION" @@ -189,7 +189,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /cache/skia/skps" @@ -207,7 +207,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /cache/skia/skps" @@ -224,7 +224,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /cache/skia/skps", @@ -262,11 +262,39 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /cache/skia/SKP_VERSION" }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "rmtree", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "rmtree test" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/test" + ], + "infra_step": true, + "name": "makedirs test" + }, { "cmd": [ "adb", @@ -280,7 +308,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "rm /dev/shm/skia/dm_out" @@ -298,7 +326,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "mkdir /dev/shm/skia/dm_out" @@ -329,7 +357,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -379,7 +407,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /cache/skia/uninteresting_hashes.txt" @@ -416,7 +444,7 @@ "cmd": [ "adb", "push", - "[START_DIR]/out/Release/dm", + "[START_DIR]/build/out/Release/dm", "/cache/skia/bin" ], "cwd": "[START_DIR]/skia", @@ -424,7 +452,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "push dm" @@ -617,7 +645,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "name": "dm" }, @@ -626,17 +654,17 @@ "adb", "pull", "/dev/shm/skia/dm_out", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" + "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, - "name": "pull /dev/shm/skia/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" + "name": "pull /dev/shm/skia/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" }, { "cmd": [ @@ -654,7 +682,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "Delete executables" @@ -669,7 +697,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "disconnect" @@ -684,7 +712,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "adb connect 192.168.1.2:5555 (2)" @@ -694,13 +722,13 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/out/Release" + "[START_DIR]/build/out/Release" ], "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "dump log", @@ -733,7 +761,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "disconnect (2)" @@ -748,7 +776,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/out" + "SKIA_OUT": "[START_DIR]/build/out" }, "infra_step": true, "name": "kill adb server" -- cgit v1.2.3