From 276886160ba96748c901b7319ca8f876415269c6 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Mon, 16 Apr 2018 13:21:01 +0000 Subject: Revert "[infra] Run recipes through Kitchen" This reverts commit 7bbb26fee0dcd7c53c1f5b80f62966654dd823ba. Reason for revert: uploads broke task scheduler Original change's description: > [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 TBR=borenet@google.com,rmistry@google.com Change-Id: Ic3a5404fde844f01eca551d50039a84a20e84e11 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7050 Reviewed-on: https://skia-review.googlesource.com/121423 Reviewed-by: Eric Boren Commit-Queue: Eric Boren --- ...930A-GPU-Adreno530-arm64-Debug-All-Android.json | 100 ++++++++------------- 1 file changed, 36 insertions(+), 64 deletions(-) (limited to 'infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json') 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 f53c4b336b..76fb94b7eb 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 @@ -12,7 +12,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" @@ -29,7 +29,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", @@ -92,7 +92,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", @@ -111,7 +111,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -129,7 +129,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/skps" @@ -147,7 +147,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" @@ -164,7 +164,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", @@ -199,7 +199,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -244,7 +244,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", @@ -263,7 +263,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -281,7 +281,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/images" @@ -299,7 +299,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/images" @@ -316,7 +316,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", @@ -351,7 +351,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -396,7 +396,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", @@ -415,7 +415,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -433,7 +433,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/svgs" @@ -451,7 +451,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" @@ -468,7 +468,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", @@ -503,39 +503,11 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_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": [ "/usr/bin/adb.1.0.35", @@ -549,7 +521,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" @@ -567,7 +539,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" @@ -598,7 +570,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "get uninteresting hashes", @@ -648,7 +620,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" @@ -685,7 +657,7 @@ "cmd": [ "/usr/bin/adb.1.0.35", "push", - "[START_DIR]/build/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], "cwd": "[START_DIR]/skia", @@ -693,7 +665,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm" @@ -713,7 +685,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "write dm.sh" @@ -730,7 +702,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "push dm.sh" @@ -746,7 +718,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "clear log" @@ -763,7 +735,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm", "~followup_annotations": [ @@ -787,30 +759,30 @@ "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/dm_out", - "[START_DIR]/[SWARM_OUT_DIR]/dm" + "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, - "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [START_DIR]/[SWARM_OUT_DIR]/dm" + "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { "cmd": [ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', '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]/build/out/Debug" + "[START_DIR]/out/Debug" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "dump log", @@ -844,7 +816,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "SKIA_OUT": "[START_DIR]/out" }, "infra_step": true, "name": "kill adb server" -- cgit v1.2.3