From: Ravi Mistry Date: Mon, 21 Nov 2016 21:06:19 +0000 (-0500) Subject: Roll recipe DEPS X-Git-Tag: submit/tizen/20180928.044319~55^2~1559 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bcca6a2124b60ce9fab18ba697b28fc6a1354db;p=platform%2Fupstream%2FlibSkiaSharp.git Roll recipe DEPS Looks like slave_build and cwd changed to start_dir in https://bugs.chromium.org/p/chromium/issues/detail?id=662586 BUG=skia:5979 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5104 Change-Id: I46d080b9089ea9b4adc2ed45fc81fdc192bdb2b2 Reviewed-on: https://skia-review.googlesource.com/5104 Reviewed-by: Ben Wagner Commit-Queue: Ravi Mistry --- diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index c0a981e842..0b247c9c0e 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -65,7 +65,7 @@ class SkiaStepApi(recipe_api.RecipeApi): def rmtree(self, path): """Wrapper around api.file.rmtree with environment fix.""" env = {} - env['PYTHONPATH'] = str(self.m.path['slave_build'].join( + env['PYTHONPATH'] = str(self.m.path['start_dir'].join( 'skia', 'infra', 'bots', '.recipe_deps', 'build', 'scripts')) self.m.file.rmtree(self.m.path.basename(path), path, diff --git a/infra/bots/recipe_modules/swarming/api.py b/infra/bots/recipe_modules/swarming/api.py index ebbce5322a..8f602bd179 100644 --- a/infra/bots/recipe_modules/swarming/api.py +++ b/infra/bots/recipe_modules/swarming/api.py @@ -20,7 +20,7 @@ class SkiaSwarmingApi(recipe_api.RecipeApi): @property def swarming_temp_dir(self): """Path where artifacts like isolate file and json output will be stored.""" - return self.m.path['slave_build'].join('swarming_temp_dir') + return self.m.path['start_dir'].join('swarming_temp_dir') @property def tasks_output_dir(self): @@ -60,7 +60,7 @@ class SkiaSwarmingApi(recipe_api.RecipeApi): '-d', luci_go_dir.join('win64')], env=env) # Copy binaries to the expected location. - dest = self.m.path['slave_build'].join('luci-go') + dest = self.m.path['start_dir'].join('luci-go') self.m.run.rmtree(dest) self.m.file.copytree('Copy Go binary', source=luci_go_dir, diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index a65db6b4be..3a894c6bfd 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -29,7 +29,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.slave_name = self.m.properties['slavename'] self.build_number = self.m.properties['buildnumber'] - self.slave_dir = self.m.path['slave_build'] + self.slave_dir = self.m.path['start_dir'] self.checkout_root = self.slave_dir self.default_env = {} self.gclient_env = {} @@ -41,7 +41,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): # The 'depot_tools' directory comes from recipe DEPS and isn't provided by # default. We have to set it manually. self.m.path.c.base_paths['depot_tools'] = ( - self.m.path.c.base_paths['slave_build'] + + self.m.path.c.base_paths['start_dir'] + ('skia', 'infra', 'bots', '.recipe_deps', 'depot_tools')) if 'Win' in self.builder_name: self.m.path.c.base_paths['depot_tools'] = ( @@ -81,7 +81,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.local_svg_dir = self.slave_dir.join('svg') if not self.is_compile_bot: self.skia_out = self.slave_dir.join('out') - self.tmp_dir = self.m.path['slave_build'].join('tmp') + self.tmp_dir = self.m.path['start_dir'].join('tmp') # Some bots also require a checkout of chromium. self.need_chromium_checkout = False diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 53fc82ea51..81237a51b8 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -47,7 +47,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -97,7 +97,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -142,7 +142,7 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/skp_output" + "[START_DIR]/skp_output" ], "name": "rmtree skp_output", "~followup_annotations": [ @@ -161,7 +161,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/skp_output", + "[START_DIR]/skp_output", "511" ], "name": "makedirs skp_output", @@ -187,7 +187,7 @@ "--browser_executable", "[CUSTOM_/_B_WORK]/src/out/Release/chrome", "--target_dir", - "[SLAVE_BUILD]/skp_output" + "[START_DIR]/skp_output" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json index dfe047bcb9..6715e7867f 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -47,7 +47,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -97,7 +97,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -142,7 +142,7 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/skp_output" + "[START_DIR]/skp_output" ], "name": "rmtree skp_output", "~followup_annotations": [ @@ -161,7 +161,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/skp_output", + "[START_DIR]/skp_output", "511" ], "name": "makedirs skp_output", @@ -187,7 +187,7 @@ "--browser_executable", "[CUSTOM_/_B_WORK]/src/out/Release/chrome", "--target_dir", - "[SLAVE_BUILD]/skp_output", + "[START_DIR]/skp_output", "--upload_to_partner_bucket" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -244,7 +244,7 @@ "python", "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_skps.py", "--target_dir", - "[SLAVE_BUILD]/skp_output" + "[START_DIR]/skp_output" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json index a5a7db9c5f..f2335f3021 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json @@ -47,7 +47,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -97,7 +97,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -142,7 +142,7 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/skp_output" + "[START_DIR]/skp_output" ], "name": "rmtree skp_output", "~followup_annotations": [ @@ -161,7 +161,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/skp_output", + "[START_DIR]/skp_output", "511" ], "name": "makedirs skp_output", @@ -187,7 +187,7 @@ "--browser_executable", "[CUSTOM_/_B_WORK]/src/out/Release/chrome", "--target_dir", - "[SLAVE_BUILD]/skp_output", + "[START_DIR]/skp_output", "--upload_to_partner_bucket" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -244,7 +244,7 @@ "python", "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_skps.py", "--target_dir", - "[SLAVE_BUILD]/skp_output" + "[START_DIR]/skp_output" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_RecreateSKPs.py b/infra/bots/recipes/swarm_RecreateSKPs.py index d21b6fb931..8770658389 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.py +++ b/infra/bots/recipes/swarm_RecreateSKPs.py @@ -113,7 +113,7 @@ def RunSteps(api): cwd=src_dir) # Clean up the output dir. - output_dir = api.path['slave_build'].join('skp_output') + output_dir = api.path['start_dir'].join('skp_output') if api.path.exists(output_dir): api.file.rmtree('skp_output', output_dir) api.file.makedirs('skp_output', output_dir) @@ -163,7 +163,7 @@ def GenTests(api): buildnumber=2, path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + - api.path.exists(api.path['slave_build'].join('skp_output')) + api.path.exists(api.path['start_dir'].join('skp_output')) ) builder = 'Housekeeper-Weekly-RecreateSKPs' @@ -176,7 +176,7 @@ def GenTests(api): buildnumber=2, path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + - api.path.exists(api.path['slave_build'].join('skp_output')) + api.path.exists(api.path['start_dir'].join('skp_output')) ) yield ( @@ -188,6 +188,6 @@ def GenTests(api): buildnumber=2, path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + - api.path.exists(api.path['slave_build'].join('skp_output')) + + api.path.exists(api.path['start_dir'].join('skp_output')) + api.step_data('Upload SKPs', retcode=1) ) diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json index 374190f08d..e3874738ca 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android/Debug", - "--args=extra_cflags=[\"-O1\"] ndk=\"[SLAVE_BUILD]/android_ndk_darwin\" target_cpu=\"mipsel\"" + "--args=extra_cflags=[\"-O1\"] ndk=\"[START_DIR]/android_ndk_darwin\" target_cpu=\"mipsel\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json index 6def77143d..78b81c7ac1 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json @@ -98,7 +98,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot/Debug", - "--args=extra_cflags=[\"-O1\"] ndk=\"[SLAVE_BUILD]/android_ndk_linux\" target_cpu=\"arm64\"" + "--args=extra_cflags=[\"-O1\"] ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json index 1a93407124..553bbae0bd 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs/Debug", - "--args=extra_cflags=[\"-O1\"] ndk=\"[SLAVE_BUILD]/android_ndk_linux\" skia_enable_android_framework_defines=true target_cpu=\"arm64\"" + "--args=extra_cflags=[\"-O1\"] ndk=\"[START_DIR]/android_ndk_linux\" skia_enable_android_framework_defines=true target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json index cd10e72cde..0e44619a29 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android/Release", - "--args=is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" target_cpu=\"arm64\"" + "--args=is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json index 1986d47757..aba757358a 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan/Release", - "--args=is_debug=false ndk=\"[SLAVE_BUILD]/android_ndk_linux\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\"" + "--args=is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 2f73d5bfc1..587b3e4869 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug", - "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-fuse-ld=lld\"] sanitize=\"ASAN\"" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-fuse-ld=lld\"] sanitize=\"ASAN\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index 4c529ea40a..37b4f13d6e 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug", - "--args=cc=\"[SLAVE_BUILD]/clang_linux/bin/clang\" cxx=\"[SLAVE_BUILD]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-fuse-ld=lld\"]" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-fuse-ld=lld\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 02fa13e4e4..0f3e6fad6f 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -92,7 +92,7 @@ "gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN/Debug", - "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-L[SLAVE_BUILD]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false" + "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json index bbbf5e8eb4..a3360db50b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-GN_Android\\Release", - "--args=is_debug=false ndk=\"[SLAVE_BUILD]\\n\" target_cpu=\"arm64\"" + "--args=is_debug=false ndk=\"[START_DIR]\\n\" target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 96f7e0eff8..155d46bd14 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug", - "--args=skia_use_angle=true target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=skia_use_angle=true target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 7ca0f16bea..83c5f091dc 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug", - "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json index 865ad1f75e..454ad95133 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug", - "--args=target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json index ce1fbaa477..e17720fb1a 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release", - "--args=is_debug=false skia_use_gdi=true target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=is_debug=false skia_use_gdi=true target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json index 6d538679e5..ea185df633 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release", - "--args=is_debug=false target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=is_debug=false target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 86e9f5f5d1..fb8fc4bc4f 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -92,7 +92,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan\\Release_x64", - "--args=is_debug=false skia_vulkan_sdk=\"[SLAVE_BUILD]\\win_vulkan_sdk\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=is_debug=false skia_vulkan_sdk=\"[START_DIR]\\win_vulkan_sdk\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { @@ -154,7 +154,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]\\win_vulkan_sdk", + "[START_DIR]\\win_vulkan_sdk", "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Release_x64" ], "name": "copy build products (2)", diff --git a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json index b4575adf6d..5ae2687475 100644 --- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json @@ -98,7 +98,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug", - "--args=target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json index 6a9cfe02a9..a25dbc245f 100644 --- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json @@ -84,7 +84,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -118,7 +118,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug", - "--args=target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json index a241a09cd5..212497a28d 100644 --- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json +++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json @@ -86,7 +86,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -120,7 +120,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug", - "--args=target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json index cf2352b9ce..896d8f42b4 100644 --- a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json @@ -84,7 +84,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -118,7 +118,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot\\Debug", - "--args=target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" + "--args=target_cpu=\"x86\" windk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py index 1e1603135e..3d8415fc69 100644 --- a/infra/bots/recipes/swarm_compile.py +++ b/infra/bots/recipes/swarm_compile.py @@ -140,7 +140,7 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) ) if 'Win' in builder: @@ -172,7 +172,7 @@ def GenTests(api): patchset=1, issue=2147533002L) + api.path.exists( - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.platform('win', 64) ) diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 398ee3ef93..8b835adacc 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Release", + "[START_DIR]/out/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Release", + "[START_DIR]/out/Release", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], "name": "Write ct-nanobench-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], "name": "Write ct-nanobench-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], "name": "Write ct-nanobench-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], "name": "Write ct-nanobench-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "name": "Write ct-nanobench-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" ], "name": "ct-nanobench-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1325,7 +1325,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", "/path/to/tmp/json" ], "name": "listdir output dir", @@ -1353,7 +1353,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1375,7 +1375,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1391,7 +1391,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1402,7 +1402,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" ], "name": "ct-nanobench-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1454,7 +1454,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", "/path/to/tmp/json" ], "name": "listdir output dir (2)", @@ -1482,7 +1482,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1504,7 +1504,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1520,7 +1520,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1531,7 +1531,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" ], "name": "ct-nanobench-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1583,7 +1583,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", "/path/to/tmp/json" ], "name": "listdir output dir (3)", @@ -1611,7 +1611,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1633,7 +1633,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1649,7 +1649,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1660,7 +1660,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" ], "name": "ct-nanobench-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1712,7 +1712,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", "/path/to/tmp/json" ], "name": "listdir output dir (4)", @@ -1740,7 +1740,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1762,7 +1762,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1778,7 +1778,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1789,7 +1789,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" ], "name": "ct-nanobench-5 on Ubuntu-14.04", "~followup_annotations": [ @@ -1841,7 +1841,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", "/path/to/tmp/json" ], "name": "listdir output dir (5)", @@ -1869,7 +1869,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1891,7 +1891,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 57d81139bd..48aca973c2 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], "name": "ct-dm-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], "name": "ct-dm-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], "name": "ct-dm-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1448,7 +1448,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1459,7 +1459,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], "name": "ct-dm-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1510,7 +1510,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1521,7 +1521,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], "name": "ct-dm-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index a55058b526..89f3974bcb 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], "name": "ct-dm-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], "name": "ct-dm-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], "name": "ct-dm-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1448,7 +1448,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1459,7 +1459,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], "name": "ct-dm-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1510,7 +1510,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1521,7 +1521,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], "name": "ct-dm-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 0ef78a1b0e..17973e7fdb 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -51,7 +51,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -86,7 +86,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -119,7 +119,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -132,7 +132,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -145,7 +145,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -183,7 +183,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -197,7 +197,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -210,7 +210,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -219,7 +219,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -234,7 +234,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -243,7 +243,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -254,14 +254,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -323,10 +323,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -346,7 +346,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -360,10 +360,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -385,7 +385,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -448,7 +448,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -470,8 +470,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" }, @@ -483,7 +483,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -568,8 +568,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" }, @@ -581,7 +581,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -644,7 +644,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -666,8 +666,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" }, @@ -679,7 +679,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -742,7 +742,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -764,8 +764,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" }, @@ -777,7 +777,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -840,7 +840,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -862,8 +862,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" }, @@ -882,18 +882,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -912,7 +912,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -983,7 +983,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1054,7 +1054,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1125,7 +1125,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1196,7 +1196,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1268,7 +1268,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1279,7 +1279,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], "name": "ct-dm-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1330,7 +1330,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1341,7 +1341,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], "name": "ct-dm-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1392,7 +1392,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1403,7 +1403,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], "name": "ct-dm-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1454,7 +1454,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1465,7 +1465,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], "name": "ct-dm-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1516,7 +1516,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1527,7 +1527,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], "name": "ct-dm-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index 0730e7384d..ee265bdeb4 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], "name": "ct-dm-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], "name": "ct-dm-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], "name": "ct-dm-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1448,7 +1448,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1459,7 +1459,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], "name": "ct-dm-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1510,7 +1510,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1521,7 +1521,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], "name": "ct-dm-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index d1a4909248..b606deef43 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], "name": "ct-dm-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1328,7 +1328,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1339,7 +1339,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], "name": "ct-dm-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1390,7 +1390,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1401,7 +1401,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], "name": "ct-dm-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1456,7 +1456,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1467,7 +1467,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], "name": "ct-dm-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1518,7 +1518,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1529,7 +1529,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], "name": "ct-dm-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 044f12b4f1..3108f11ac3 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-1" ], "name": "ct-dm-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-2" ], "name": "ct-dm-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-3" ], "name": "ct-dm-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1452,7 +1452,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1463,7 +1463,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-4" ], "name": "ct-dm-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1514,7 +1514,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1525,7 +1525,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-dm-5" ], "name": "ct-dm-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index b5ec742e41..cf0fe3eaef 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Release", + "[START_DIR]/out/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Release", + "[START_DIR]/out/Release", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], "name": "Write ct-nanobench-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], "name": "Write ct-nanobench-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], "name": "Write ct-nanobench-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], "name": "Write ct-nanobench-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "name": "Write ct-nanobench-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -980,7 +980,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1054,7 +1054,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1128,7 +1128,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1202,7 +1202,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1277,7 +1277,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1288,7 +1288,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" ], "name": "ct-nanobench-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1340,7 +1340,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", "/path/to/tmp/json" ], "name": "listdir output dir", @@ -1368,7 +1368,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1390,7 +1390,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1406,7 +1406,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1417,7 +1417,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" ], "name": "ct-nanobench-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1469,7 +1469,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", "/path/to/tmp/json" ], "name": "listdir output dir (2)", @@ -1497,7 +1497,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1519,7 +1519,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1535,7 +1535,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1546,7 +1546,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" ], "name": "ct-nanobench-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1598,7 +1598,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", "/path/to/tmp/json" ], "name": "listdir output dir (3)", @@ -1626,7 +1626,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1648,7 +1648,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1664,7 +1664,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1675,7 +1675,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" ], "name": "ct-nanobench-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1727,7 +1727,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", "/path/to/tmp/json" ], "name": "listdir output dir (4)", @@ -1755,7 +1755,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1777,7 +1777,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1793,7 +1793,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1804,7 +1804,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" ], "name": "ct-nanobench-5 on Ubuntu-14.04", "~followup_annotations": [ @@ -1856,7 +1856,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", "/path/to/tmp/json" ], "name": "listdir output dir (5)", @@ -1884,7 +1884,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1906,7 +1906,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index e2b4aa6ae3..e6eafcc989 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Release", + "[START_DIR]/out/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Release", + "[START_DIR]/out/Release", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], "name": "Write ct-nanobench-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], "name": "Write ct-nanobench-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], "name": "Write ct-nanobench-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], "name": "Write ct-nanobench-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "name": "Write ct-nanobench-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -980,7 +980,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1054,7 +1054,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1128,7 +1128,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1202,7 +1202,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1277,7 +1277,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1288,7 +1288,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1" ], "name": "ct-nanobench-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1340,7 +1340,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", "/path/to/tmp/json" ], "name": "listdir output dir", @@ -1368,7 +1368,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1390,7 +1390,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1406,7 +1406,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1417,7 +1417,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2" ], "name": "ct-nanobench-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1469,7 +1469,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", "/path/to/tmp/json" ], "name": "listdir output dir (2)", @@ -1497,7 +1497,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1519,7 +1519,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1535,7 +1535,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1546,7 +1546,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3" ], "name": "ct-nanobench-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1598,7 +1598,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", "/path/to/tmp/json" ], "name": "listdir output dir (3)", @@ -1626,7 +1626,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1648,7 +1648,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1664,7 +1664,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1675,7 +1675,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4" ], "name": "ct-nanobench-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1727,7 +1727,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", "/path/to/tmp/json" ], "name": "listdir output dir (4)", @@ -1755,7 +1755,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1777,7 +1777,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1793,7 +1793,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1804,7 +1804,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5" ], "name": "ct-nanobench-5 on Ubuntu-14.04", "~followup_annotations": [ @@ -1856,7 +1856,7 @@ "python", "-u", "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", "/path/to/tmp/json" ], "name": "listdir output dir (5)", @@ -1884,7 +1884,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { @@ -1906,7 +1906,7 @@ "----", "cp", "-R", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2", "gs://skia-perf/ct/10k/2012/05/14/12/" ], "env": { diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index c967bbee36..344a76cbd5 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" ], "name": "ct-get_images_from_skps-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" ], "name": "ct-get_images_from_skps-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" ], "name": "ct-get_images_from_skps-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1448,7 +1448,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1459,7 +1459,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" ], "name": "ct-get_images_from_skps-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1510,7 +1510,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1521,7 +1521,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" ], "name": "ct-get_images_from_skps-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 183ba252c4..8d9c185005 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" ], "name": "ct-get_images_from_skps-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" ], "name": "ct-get_images_from_skps-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" ], "name": "ct-get_images_from_skps-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1448,7 +1448,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1459,7 +1459,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" ], "name": "ct-get_images_from_skps-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1510,7 +1510,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1521,7 +1521,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" ], "name": "ct-get_images_from_skps-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 75dfb174d6..125a9cd55b 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ @@ -80,7 +80,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -113,7 +113,7 @@ "cmd": [ "gn", "gen", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -126,7 +126,7 @@ "cmd": [ "ninja", "-C", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { @@ -139,7 +139,7 @@ "python", "-u", "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[SLAVE_BUILD]/out/Debug", + "[START_DIR]/out/Debug", "[CUSTOM_/_B_WORK]/skia/infra/bots/ct" ], "name": "copy build products", @@ -177,7 +177,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -191,7 +191,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -204,7 +204,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -213,7 +213,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -228,7 +228,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -237,7 +237,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -248,14 +248,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -317,10 +317,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -340,7 +340,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary", @@ -354,10 +354,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/swarming_temp_dir" + "[START_DIR]/swarming_temp_dir" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree swarming_temp_dir", "~followup_annotations": [ @@ -379,7 +379,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave1" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave1", "~followup_annotations": [ @@ -442,7 +442,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -464,8 +464,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, @@ -477,7 +477,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave2" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave2", "~followup_annotations": [ @@ -540,7 +540,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -562,8 +562,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, @@ -575,7 +575,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave3" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave3", "~followup_annotations": [ @@ -638,7 +638,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -660,8 +660,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, @@ -673,7 +673,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave4" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave4", "~followup_annotations": [ @@ -736,7 +736,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (4)", @@ -758,8 +758,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, @@ -771,7 +771,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave5" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree slave5", "~followup_annotations": [ @@ -834,7 +834,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (5)", @@ -856,8 +856,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, @@ -876,18 +876,18 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json", - "[SLAVE_BUILD]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -906,7 +906,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -977,7 +977,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1048,7 +1048,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1119,7 +1119,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1190,7 +1190,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -1262,7 +1262,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1273,7 +1273,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-1" ], "name": "ct-get_images_from_skps-1 on Ubuntu-14.04", "~followup_annotations": [ @@ -1324,7 +1324,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1335,7 +1335,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-2" ], "name": "ct-get_images_from_skps-2 on Ubuntu-14.04", "~followup_annotations": [ @@ -1386,7 +1386,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1397,7 +1397,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-3" ], "name": "ct-get_images_from_skps-3 on Ubuntu-14.04", "~followup_annotations": [ @@ -1448,7 +1448,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1459,7 +1459,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-4" ], "name": "ct-get_images_from_skps-4 on Ubuntu-14.04", "~followup_annotations": [ @@ -1510,7 +1510,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -1521,7 +1521,7 @@ "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" + "[START_DIR]/swarming_temp_dir/outputs/ct-get_images_from_skps-5" ], "name": "ct-get_images_from_skps-5 on Ubuntu-14.04", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_ct_skps.py b/infra/bots/recipes/swarm_ct_skps.py index d27f15ece6..9d14bed2ae 100644 --- a/infra/bots/recipes/swarm_ct_skps.py +++ b/infra/bots/recipes/swarm_ct_skps.py @@ -320,8 +320,8 @@ def GenTests(api): revision=skia_revision, ) + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('src') + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('src') ) ) @@ -340,8 +340,8 @@ def GenTests(api): revision=skia_revision, ) + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('src') + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('src') ) ) @@ -360,8 +360,8 @@ def GenTests(api): revision=skia_revision, ) + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('src') + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('src') ) ) diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json index e520e21b3f..ab5b8ffd1b 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -24,13 +24,13 @@ { "cmd": [ "python", - "[SLAVE_BUILD]/skia/platform_tools/android/tests/run_all.py" + "[START_DIR]/skia/platform_tools/android/tests/run_all.py" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "android platform self-tests" }, @@ -39,7 +39,7 @@ "python", "RECIPE_MODULE[skia::core]/resources/run_binary_size_analysis.py", "--library", - "[SLAVE_BUILD]/out/Release/lib/libskia.so", + "[START_DIR]/out/Release/lib/libskia.so", "--githash", "abc123", "--gsutil_path", @@ -47,43 +47,43 @@ "--issue_number", "500" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate and upload binary size data" }, { "cmd": [ - "[SLAVE_BUILD]/go/go/bin/go", + "[START_DIR]/go/go/bin/go", "get", "go.skia.org/infra/comments/go/extract_comments" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GOPATH": "[SLAVE_BUILD]/tmp/golib", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "GOPATH": "[START_DIR]/tmp/golib", + "SKIA_OUT": "[START_DIR]/out" }, "name": "compile extract_comments" }, { "cmd": [ - "[SLAVE_BUILD]/tmp/golib/bin/extract_comments", + "[START_DIR]/tmp/golib/bin/extract_comments", "--dir", "gm", "--dest", "gs://skia-doc/gm/comments.json" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GOPATH": "[SLAVE_BUILD]/tmp/golib", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "GOPATH": "[START_DIR]/tmp/golib", + "SKIA_OUT": "[START_DIR]/out" }, "name": "run extract_comments" }, diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json index 0664f15aba..c484a36bb5 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -24,13 +24,13 @@ { "cmd": [ "python", - "[SLAVE_BUILD]/skia/platform_tools/android/tests/run_all.py" + "[START_DIR]/skia/platform_tools/android/tests/run_all.py" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "android platform self-tests" }, @@ -39,11 +39,11 @@ "python", "RECIPE_MODULE[skia::core]/resources/generate_and_upload_doxygen.py" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate and upload doxygen" }, @@ -52,49 +52,49 @@ "python", "RECIPE_MODULE[skia::core]/resources/run_binary_size_analysis.py", "--library", - "[SLAVE_BUILD]/out/Release/lib/libskia.so", + "[START_DIR]/out/Release/lib/libskia.so", "--githash", "abc123", "--gsutil_path", "[DEPOT_TOOLS]/gsutil.py" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "generate and upload binary size data" }, { "cmd": [ - "[SLAVE_BUILD]/go/go/bin/go", + "[START_DIR]/go/go/bin/go", "get", "go.skia.org/infra/comments/go/extract_comments" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GOPATH": "[SLAVE_BUILD]/tmp/golib", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "GOPATH": "[START_DIR]/tmp/golib", + "SKIA_OUT": "[START_DIR]/out" }, "name": "compile extract_comments" }, { "cmd": [ - "[SLAVE_BUILD]/tmp/golib/bin/extract_comments", + "[START_DIR]/tmp/golib/bin/extract_comments", "--dir", "gm", "--dest", "gs://skia-doc/gm/comments.json" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GOPATH": "[SLAVE_BUILD]/tmp/golib", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "GOPATH": "[START_DIR]/tmp/golib", + "SKIA_OUT": "[START_DIR]/out" }, "name": "run extract_comments" }, diff --git a/infra/bots/recipes/swarm_housekeeper.py b/infra/bots/recipes/swarm_housekeeper.py index 4400f3f8ed..c2e8c6b708 100644 --- a/infra/bots/recipes/swarm_housekeeper.py +++ b/infra/bots/recipes/swarm_housekeeper.py @@ -102,7 +102,7 @@ def GenTests(api): revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + - api.path.exists(api.path['slave_build']) + api.path.exists(api.path['start_dir']) ) if 'Trybot' in buildername: test.properties['issue'] = '500' diff --git a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json index 6e0b6349f9..dae9cc3cf3 100644 --- a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_infra.expected/failed_one_update.json b/infra/bots/recipes/swarm_infra.expected/failed_one_update.json index 1bf15b8ba0..bb21f4f523 100644 --- a/infra/bots/recipes/swarm_infra.expected/failed_one_update.json +++ b/infra/bots/recipes/swarm_infra.expected/failed_one_update.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_infra.expected/infra_tests.json b/infra/bots/recipes/swarm_infra.expected/infra_tests.json index 7defe60b96..b2416faea3 100644 --- a/infra/bots/recipes/swarm_infra.expected/infra_tests.json +++ b/infra/bots/recipes/swarm_infra.expected/infra_tests.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json index 7c3a3324dd..4c222d112c 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,20 +342,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -364,7 +364,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -372,10 +372,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -384,7 +384,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -417,7 +417,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -444,7 +444,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json index a4231d116a..199abf21f0 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,20 +342,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -364,7 +364,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -372,10 +372,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -384,7 +384,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -417,7 +417,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -444,7 +444,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json index 6261e8a83f..f6101b463a 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json index 2bc3f73912..e847a237d6 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json index 2b389c488b..c4228de6c1 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json index 3982f1b924..35b20726c3 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/perf" }, { @@ -367,17 +367,17 @@ "-p", "/sdcard/revenge_of_the_skiabot/perf" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/perf" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench" }, { @@ -386,7 +386,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst esinst4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/nanobench.sh" + "[START_DIR]/tmp/nanobench.sh" ], "name": "write nanobench.sh" }, @@ -394,10 +394,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/nanobench.sh", + "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push nanobench.sh" }, { @@ -406,7 +406,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -463,7 +463,7 @@ "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android/data" }, { @@ -471,7 +471,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -498,7 +498,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index 3e9ac92d65..9492e955a7 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN/data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nogpu", "--pre_log", "--scales", @@ -175,7 +175,7 @@ "os", "Mac" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 511830121f..16a2734c6e 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/nanobench", + "[START_DIR]/out/Debug/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nocpu", "--pre_log", "--images", @@ -102,7 +102,7 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json index e4f72c83f2..3b4b94c675 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN/data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -106,16 +106,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nogpu", "--pre_log", "--scales", @@ -175,7 +175,7 @@ "os", "Ubuntu" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json index c7153204e9..7eda498082 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE/data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -106,16 +106,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Release/nanobench", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--nocpu", "--pre_log", "--images", @@ -179,7 +179,7 @@ "os", "Ubuntu" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 026a9f6e0f..ff596e3b53 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,15 +67,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -124,7 +124,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -136,15 +136,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -195,7 +195,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench --abandonGpuContext" }, diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 4ec83b4f04..f3fd6492cb 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\nanobench", + "[START_DIR]\\out\\Debug_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nogpu", "--pre_log", "--scales", @@ -108,7 +108,7 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 82f3901a1d..9a94744ff1 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nogpu", "--pre_log", "--scales", @@ -172,7 +172,7 @@ "os", "Win" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index fdaab65cb6..3e02cdd9f1 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\nanobench", + "[START_DIR]\\out\\Debug_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -111,7 +111,7 @@ "~inc0.webp", "~inc1.webp" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index d5a1e55be4..c743570a0f 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -180,7 +180,7 @@ "os", "Win8" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index a8ea9cbffd..a5c89e7611 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -1,27 +1,27 @@ [ { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" + "[START_DIR]/skia/platform_tools/ios/bin/ios_install" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "install iOSShell" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skia/resources", "skiabot/skia_resources" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push resources to skia_resources" }, @@ -30,7 +30,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -41,97 +41,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SKP_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skp to skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SKP_VERSION", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION" + "name": "push [START_DIR]/tmp/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -142,97 +142,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skimage to skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -243,94 +243,94 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SVG_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/svg", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push svg to svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SVG_VERSION", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + "name": "push [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", + "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", "--nanobench", "--undefok", "-i", @@ -391,20 +391,20 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "nanobench" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart" + "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "reboot" }, @@ -416,8 +416,8 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "wait for reboot" }, diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 66bc931f6a..2817618709 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -105,16 +105,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -180,7 +180,7 @@ "os", "Win8" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/nobuildbot.json b/infra/bots/recipes/swarm_perf.expected/nobuildbot.json index 5792a79834..01b485bc21 100644 --- a/infra/bots/recipes/swarm_perf.expected/nobuildbot.json +++ b/infra/bots/recipes/swarm_perf.expected/nobuildbot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree data", "~followup_annotations": [ @@ -133,16 +133,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\nanobench", + "[START_DIR]\\out\\Release_x64\\nanobench", "--undefok", "-i", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\nanobench", + "[START_DIR]\\skimage\\nanobench", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--nocpu", "--pre_log", "--images", @@ -214,7 +214,7 @@ "os", "Win8" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "nanobench" }, { diff --git a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json index 7aacca786f..ed45dac5ab 100644 --- a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -26,7 +26,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -37,7 +37,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -57,7 +57,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -66,7 +66,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -77,7 +77,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -89,15 +89,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -146,7 +146,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench" }, @@ -158,15 +158,15 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/nanobench", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", "--undefok", "-i", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/nanobench", + "[START_DIR]/skimage/nanobench", "--nocpu", "--pre_log", "--images", @@ -217,7 +217,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "nanobench --abandonGpuContext" }, diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py index 545753f9e0..42123c9850 100644 --- a/infra/bots/recipes/swarm_perf.py +++ b/infra/bots/recipes/swarm_perf.py @@ -267,12 +267,12 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) ) if 'Trybot' in builder: @@ -298,14 +298,14 @@ def GenTests(api): patchset=1, issue=2147533002L) + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.platform('win', 64) ) @@ -349,14 +349,14 @@ def GenTests(api): gerrit_url='https://skia-review.googlesource.com/', ) + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.platform('win', 64) + api.step_data('get swarming bot id', diff --git a/infra/bots/recipes/swarm_presubmit.expected/presubmit.json b/infra/bots/recipes/swarm_presubmit.expected/presubmit.json index c6bcfa8af4..a83e094b01 100644 --- a/infra/bots/recipes/swarm_presubmit.expected/presubmit.json +++ b/infra/bots/recipes/swarm_presubmit.expected/presubmit.json @@ -45,7 +45,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "bot_update", "~followup_annotations": [ diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json index 4f62b1e4d8..6353575a6c 100644 --- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json +++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -29,7 +29,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -37,7 +37,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -48,7 +48,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -59,7 +59,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -71,7 +71,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -82,7 +82,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -93,7 +93,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -101,11 +101,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -129,27 +129,27 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push skpbench" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/skpbench/skpbench.py", + "[START_DIR]/skia/tools/skpbench/skpbench.py", "/data/local/tmp/skpbench", "/sdcard/revenge_of_the_skiabot/skps", "--adb", @@ -214,7 +214,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/skpbench/skiaperf.py", + "[START_DIR]/skia/tools/skpbench/skiaperf.py", "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", @@ -252,7 +252,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -279,7 +279,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json index c62e420feb..5a54a616b7 100644 --- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json +++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -29,7 +29,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -37,7 +37,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -48,7 +48,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -59,7 +59,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -71,7 +71,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -82,7 +82,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -93,7 +93,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -101,11 +101,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -129,27 +129,27 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/skpbench", + "[START_DIR]/out/Release/skpbench", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push skpbench" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/skpbench/skpbench.py", + "[START_DIR]/skia/tools/skpbench/skpbench.py", "/data/local/tmp/skpbench", "/sdcard/revenge_of_the_skiabot/skps", "--adb", @@ -214,7 +214,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/skpbench/skiaperf.py", + "[START_DIR]/skia/tools/skpbench/skiaperf.py", "[CUSTOM_[SWARM_OUT_DIR]]/table", "--properties", "gitHash", @@ -252,7 +252,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -279,7 +279,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_skpbench.py b/infra/bots/recipes/swarm_skpbench.py index f5d1ef487f..7cd96f61e0 100644 --- a/infra/bots/recipes/swarm_skpbench.py +++ b/infra/bots/recipes/swarm_skpbench.py @@ -126,8 +126,8 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), ) + api.step_data('get swarming bot id', diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index bb5061f577..2de2cadb0e 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value MT6582 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut --match ~WritePixels; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json index 313ccf4e03..478db9a8a0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Mali400MP2 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~WritePixels; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json index 5e54973475..1883ff0ef5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config GN_Android model GalaxyS7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --threads 0 --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json index a84eb8d41a..b4fd5ab6b0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model NVIDIA_Shield os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gl gldft glsrgb glmsaa4 glinstdit4 serialize-8888 tiles_rt-8888 pic-8888 glinst --src tests gm image colorImage svg --blacklist glsrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json index 3f242a60b0..aa144e7533 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value MaliT604 extra_config GN_Android model Nexus10 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json index b08f03202a..6e58fd5dc9 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 esinst --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json index 942ba93b38..bb07359b71 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno430 extra_config GN_Android_Vulkan model Nexus6p os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config vk --src tests gm image colorImage svg --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~XfermodeImageFilterCroppedInput ~GrTextureStripAtlasFlush ~CopySurface; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json index cebfd771cb..317181c816 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json index d0dfddcaa5..c5968d4f19 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu CPU cpu_or_gpu_value Denver extra_config GN_Android model Nexus9 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --noRAW_threading; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json index e58b2ac6e7..fc60b8e592 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch x86 compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value SSE4 extra_config GN_Android model NexusPlayer os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpusrgb --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape --match ~ResourceCache --noRAW_threading; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json index 652b951441..aaa475c9ce 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 esinstdit4 serialize-8888 tiles_rt-8888 pic-8888 esinst --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index eae7d0348e..a1b382d445 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -213,7 +213,7 @@ "os", "Mac", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nocpu", @@ -583,7 +583,7 @@ "_", "blurcircles" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 15391a9e75..704d6790e7 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -213,7 +213,7 @@ "os", "Mac", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -485,7 +485,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index a4245ce7b1..21e42dc0e2 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -215,7 +215,7 @@ "os", "Mac", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nocpu", @@ -413,7 +413,7 @@ "_", ".SRW" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index b7c0126564..9ba4805257 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86", @@ -214,7 +214,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -468,7 +468,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 8a11d653c9..ac23721cac 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -82,7 +82,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -349,11 +349,11 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", - "PATH": "%(PATH)s:[SLAVE_BUILD]/clang_linux/bin", + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "dm" diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 1f38798bb9..50826cdbdb 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -82,7 +82,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -352,10 +352,10 @@ "~Once", "~Shared" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { - "LD_LIBRARY_PATH": "[SLAVE_BUILD]/clang_linux/msan", - "PATH": "%(PATH)s:[SLAVE_BUILD]/clang_linux/bin" + "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan", + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin" }, "name": "dm" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index d17a8d1a4f..690f74f05b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -214,7 +214,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -466,7 +466,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 0d2092a19b..8360a05fb9 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -216,7 +216,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -468,7 +468,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index a4a90c8917..61b492dd54 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -82,7 +82,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -353,9 +353,9 @@ "~RGBA4444TextureTest", "~RGB565TextureTest" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { - "PATH": "%(PATH)s:[SLAVE_BUILD]/clang_linux/bin" + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin" }, "name": "dm" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index c49f5190bf..589091ed2b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,17 +67,17 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/dm", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -89,7 +89,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -412,7 +412,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, @@ -424,17 +424,17 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/dm", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -446,7 +446,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -770,7 +770,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm --abandonGpuContext" }, @@ -782,17 +782,17 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/dm", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -804,7 +804,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -1128,7 +1128,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm --preAbandonGpuContext" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 786f1fc522..b44fc614c1 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -215,7 +215,7 @@ "os", "Win10", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nocpu", @@ -365,7 +365,7 @@ "_", ".SRW" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index a2cd633609..444eb7cce8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\dm", + "[START_DIR]\\out\\Release_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -202,7 +202,7 @@ "patch_storage", "rietveld", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -219,7 +219,7 @@ "os", "Win8", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", @@ -470,7 +470,7 @@ "gamut", "--noRAW_threading" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 1f79dbd209..7b5a76d0f5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -215,7 +215,7 @@ "os", "Win8", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nocpu", @@ -379,7 +379,7 @@ "~GLPrograms", "--noRAW_threading" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 1802f66812..363e311740 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -1,27 +1,27 @@ [ { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" + "[START_DIR]/skia/platform_tools/ios/bin/ios_install" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "install iOSShell" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skia/resources", "skiabot/skia_resources" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push resources to skia_resources" }, @@ -30,7 +30,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -41,97 +41,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SKP_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skp to skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SKP_VERSION", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION" + "name": "push [START_DIR]/tmp/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -142,97 +142,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skimage to skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -243,90 +243,90 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SVG_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/svg", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push svg to svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SVG_VERSION", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + "name": "push [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ @@ -336,7 +336,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -374,27 +374,27 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_dm" }, @@ -403,7 +403,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -425,13 +425,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -470,21 +470,21 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/uninteresting_hashes.txt", "skiabot/skia_tmp_dir/uninteresting_hashes.txt" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", + "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", "--dm", "--undefok", "--resourcePath", @@ -903,34 +903,34 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_pull_if_needed", + "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "skiabot/skia_dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "pull skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart" + "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "reboot" }, @@ -942,8 +942,8 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "wait for reboot" }, diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index cd6118b6ea..f1deb65e10 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]\\tmp", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\dm", + "[START_DIR]\\out\\Release_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -202,7 +202,7 @@ "patch_storage", "rietveld", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -219,7 +219,7 @@ "os", "Win8", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", @@ -470,7 +470,7 @@ "gamut", "--noRAW_threading" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index 900b8a6215..0ae65967ff 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "6", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -214,7 +214,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -466,7 +466,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm", "~followup_annotations": [ "step returned non-zero exit code: 1", diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 5f233db06d..0e79bff74e 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "step returned non-zero exit code: 1", @@ -485,20 +485,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -507,7 +507,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android build_number 6 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -515,10 +515,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -527,7 +527,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -562,7 +562,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -570,7 +570,7 @@ "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", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -597,7 +597,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json index d669f4664e..5294fbfdbe 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json @@ -1,27 +1,27 @@ [ { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" + "[START_DIR]/skia/platform_tools/ios/bin/ios_install" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "install iOSShell" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skia/resources", "skiabot/skia_resources" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push resources to skia_resources" }, @@ -30,7 +30,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -41,20 +41,20 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SKP_VERSION", "stdout": "/path/to/tmp/", @@ -65,77 +65,77 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skp to skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SKP_VERSION", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION" + "name": "push [START_DIR]/tmp/SKP_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -146,97 +146,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skimage to skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION" }, { "cmd": [ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -247,90 +247,90 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SVG_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/svg", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push svg to svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SVG_VERSION", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + "name": "push [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ @@ -340,7 +340,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -378,27 +378,27 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_dm" }, @@ -407,7 +407,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -429,13 +429,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -474,21 +474,21 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/uninteresting_hashes.txt", "skiabot/skia_tmp_dir/uninteresting_hashes.txt" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", + "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", "--dm", "--undefok", "--resourcePath", @@ -907,34 +907,34 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_pull_if_needed", + "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "skiabot/skia_dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "pull skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart" + "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "reboot" }, @@ -946,8 +946,8 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "wait for reboot" }, diff --git a/infra/bots/recipes/swarm_test.expected/nobuildbot.json b/infra/bots/recipes/swarm_test.expected/nobuildbot.json index 0acebad177..7b0a5a7858 100644 --- a/infra/bots/recipes/swarm_test.expected/nobuildbot.json +++ b/infra/bots/recipes/swarm_test.expected/nobuildbot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -26,7 +26,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -37,7 +37,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -57,7 +57,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -66,7 +66,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -77,7 +77,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -89,7 +89,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -204,16 +204,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -237,7 +237,7 @@ "swarming_task_id", "123456", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86", @@ -506,7 +506,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json index 50afad0749..d2ec5d7408 100644 --- a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/tmp", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -26,7 +26,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -37,7 +37,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -57,7 +57,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -66,7 +66,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -77,7 +77,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -89,7 +89,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -130,13 +130,13 @@ "python", "-u", "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -203,7 +203,7 @@ "patch_storage", "gerrit", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86", @@ -472,7 +472,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py index 3a518432d3..a1de3c0b8e 100644 --- a/infra/bots/recipes/swarm_test.py +++ b/infra/bots/recipes/swarm_test.py @@ -569,14 +569,14 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) ) if 'Trybot' in builder: @@ -600,14 +600,14 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.step_data('dm', retcode=1) ) @@ -623,14 +623,14 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.step_data('get uninteresting hashes', retcode=1) ) @@ -646,14 +646,14 @@ def GenTests(api): path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.step_data('read SKP_VERSION', retcode=1) ) @@ -672,14 +672,14 @@ def GenTests(api): patchset=1, issue=2147533002L) + api.path.exists( - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'), - api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', + api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', 'svg', 'VERSION'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') ) + api.platform('win', 64) ) diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json index 800cd7f818..d1c8892add 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_darwin/VERSION", + "[START_DIR]/skia/infra/bots/assets/android_ndk_darwin/VERSION", "/path/to/tmp/" ], "name": "read android_ndk_darwin VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json index a234e83778..f8ad500ec2 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json index 8ab0f27deb..05838dc8d6 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "name": "read android_ndk_linux VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 0fdfc03515..e94140f04a 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json index 96cef6f4ed..609167cdb2 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json index 4d95548013..360ed5d1c2 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json index 18055e4ee0..b4a720fbb4 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -405,7 +405,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 7fec6e95a1..186045a475 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", + "[START_DIR]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" ], "name": "read win_toolchain VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/win_vulkan_sdk/VERSION", + "[START_DIR]/skia/infra/bots/assets/win_vulkan_sdk/VERSION", "/path/to/tmp/" ], "name": "read win_vulkan_sdk VERSION" @@ -282,7 +282,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -304,8 +304,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -314,14 +314,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -336,7 +336,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -424,7 +424,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json index 9b38b452f3..60338d4428 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", + "[START_DIR]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" ], "name": "read win_toolchain VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index de660de728..7583270956 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-RecreateSKPs_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/RecreateSKPs_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-RecreateSKPs_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/RecreateSKPs_skia.isolated.gen.json" ], "name": "Write RecreateSKPs_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/RecreateSKPs_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/RecreateSKPs_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -399,7 +399,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json index 13a0e48c48..34a2623e35 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json +++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/presubmit_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-presubmit_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/presubmit_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/presubmit_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-presubmit_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/presubmit_skia.isolated.gen.json" ], "name": "Write presubmit_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/presubmit_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/presubmit_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -399,7 +399,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json index 9c9eb6f02e..cbe553b9a2 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/go/VERSION", + "[START_DIR]/skia/infra/bots/assets/go/VERSION", "/path/to/tmp/" ], "name": "read go VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -493,8 +493,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/housekeeper_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-housekeeper_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/housekeeper_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/housekeeper_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-housekeeper_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/housekeeper_skia.isolated.gen.json" ], "name": "Write housekeeper_skia.isolated.gen.json" }, @@ -503,14 +503,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/housekeeper_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/housekeeper_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -526,7 +526,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-housekeeper_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-housekeeper_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -549,11 +549,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-housekeeper_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-housekeeper_skia.isolated" ], "name": "upload new .isolated file for housekeeper_skia", "stdout": "/path/to/tmp/" @@ -562,7 +562,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -647,7 +647,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json index 9d7ca5ee52..de0540023f 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json +++ b/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/infra_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-infra_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/infra_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/infra_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-infra_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/infra_skia.isolated.gen.json" ], "name": "Write infra_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/infra_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/infra_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -399,7 +399,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 db70e78941..baf03f3028 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -405,7 +405,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -466,7 +466,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -476,7 +476,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -486,7 +486,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -496,7 +496,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -518,8 +518,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/perf_skia.isolated.gen.json" ], "name": "Write perf_skia.isolated.gen.json" }, @@ -528,14 +528,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/perf_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -551,7 +551,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-perf_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -574,11 +574,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-perf_skia.isolated" ], "name": "upload new .isolated file for perf_skia", "stdout": "/path/to/tmp/" @@ -587,7 +587,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -684,7 +684,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -745,7 +745,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -767,8 +767,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_nano_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_nano_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_nano_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_nano_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_nano_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_nano_results_skia.isolated.gen.json" ], "name": "Write upload_nano_results_skia.isolated.gen.json" }, @@ -777,14 +777,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_nano_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_nano_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -800,7 +800,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_nano_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_nano_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -823,11 +823,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_nano_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_nano_results_skia.isolated" ], "name": "upload new .isolated file for upload_nano_results_skia", "stdout": "/path/to/tmp/" @@ -836,7 +836,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -928,7 +928,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json index 7fc60bf2b7..8342a53945 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/ct_skps_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct_skps_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/ct_skps_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/ct_skps_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct_skps_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/ct_skps_skia.isolated.gen.json" ], "name": "Write ct_skps_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/ct_skps_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/ct_skps_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -396,7 +396,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 4cfc441d5a..fd52755ec6 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -481,7 +481,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -491,7 +491,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -513,8 +513,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/perf_skia.isolated.gen.json" ], "name": "Write perf_skia.isolated.gen.json" }, @@ -523,14 +523,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/perf_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-perf_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -569,11 +569,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-perf_skia.isolated" ], "name": "upload new .isolated file for perf_skia", "stdout": "/path/to/tmp/" @@ -582,7 +582,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -671,7 +671,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json index 053f622f31..0002bfc3f1 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "name": "read android_ndk_linux VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -473,7 +473,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -483,7 +483,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -493,7 +493,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -503,7 +503,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -525,8 +525,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Android\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Android\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -535,14 +535,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -558,7 +558,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -581,11 +581,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -594,7 +594,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -686,7 +686,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -747,7 +747,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -769,8 +769,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -779,14 +779,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -802,7 +802,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -825,11 +825,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -838,7 +838,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -925,7 +925,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 aa31e8c58c..8c4a849339 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "name": "read android_ndk_linux VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -473,7 +473,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -483,7 +483,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -493,7 +493,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -503,7 +503,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -525,8 +525,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Android\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Android\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -535,14 +535,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -558,7 +558,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -581,11 +581,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -594,7 +594,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -686,7 +686,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -747,7 +747,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -769,8 +769,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -779,14 +779,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -802,7 +802,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -825,11 +825,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -838,7 +838,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -925,7 +925,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 ef652871ea..bb6370f645 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "[START_DIR]/skia/infra/bots/assets/android_ndk_linux/VERSION", "/path/to/tmp/" ], "name": "read android_ndk_linux VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -473,7 +473,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -483,7 +483,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -493,7 +493,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -503,7 +503,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -525,8 +525,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Android\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Android\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -535,14 +535,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -558,7 +558,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -581,11 +581,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -594,7 +594,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -686,7 +686,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -747,7 +747,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -769,8 +769,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -779,14 +779,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -802,7 +802,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -825,11 +825,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -838,7 +838,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -925,7 +925,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 eb7ffc54ee..dd04941387 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -481,7 +481,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -491,7 +491,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -513,8 +513,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -523,14 +523,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -569,11 +569,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -582,7 +582,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -674,7 +674,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -735,7 +735,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -757,8 +757,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -767,14 +767,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -790,7 +790,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -813,11 +813,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -826,7 +826,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -913,7 +913,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 0c02a22299..88dd0317b5 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -282,7 +282,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -292,7 +292,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -314,8 +314,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/coverage_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/coverage_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -324,14 +324,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -346,7 +346,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -443,7 +443,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 7ab0c00936..5464d4f34b 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "name": "read clang_linux VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -473,7 +473,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -483,7 +483,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -493,7 +493,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -503,7 +503,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/clang_linux/VERSION", + "[START_DIR]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "name": "read clang_linux VERSION (2)" @@ -513,7 +513,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -535,8 +535,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -545,14 +545,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -568,7 +568,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -591,11 +591,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -604,7 +604,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -698,7 +698,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 a34a500890..f67dd899b7 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -481,7 +481,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -491,7 +491,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -513,8 +513,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -523,14 +523,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -569,11 +569,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -582,7 +582,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -674,7 +674,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -735,7 +735,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -757,8 +757,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -767,14 +767,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -790,7 +790,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -813,11 +813,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -826,7 +826,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -913,7 +913,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 709afa38d3..21fafd3c42 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -481,7 +481,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -491,7 +491,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -513,8 +513,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -523,14 +523,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -569,11 +569,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -582,7 +582,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -674,7 +674,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -735,7 +735,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -757,8 +757,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -767,14 +767,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -790,7 +790,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -813,11 +813,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -826,7 +826,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -913,7 +913,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 58c36bc47b..19d33e1042 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -481,7 +481,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -491,7 +491,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -513,8 +513,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -523,14 +523,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -569,11 +569,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -582,7 +582,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -671,7 +671,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 16526702ed..96c95276e6 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", + "[START_DIR]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" ], "name": "read win_toolchain VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -473,7 +473,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -483,7 +483,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -493,7 +493,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -503,7 +503,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -525,8 +525,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -535,14 +535,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -558,7 +558,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -581,11 +581,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -594,7 +594,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -683,7 +683,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -744,7 +744,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -766,8 +766,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -776,14 +776,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -799,7 +799,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -822,11 +822,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -835,7 +835,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -922,7 +922,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 8742862625..3aeb0280d7 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", + "[START_DIR]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" ], "name": "read win_toolchain VERSION" @@ -272,7 +272,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -294,8 +294,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -304,14 +304,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -326,7 +326,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -412,7 +412,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -473,7 +473,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -483,7 +483,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -493,7 +493,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -503,7 +503,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -525,8 +525,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows-2008ServerR2-SP1\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows-2008ServerR2-SP1\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -535,14 +535,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -558,7 +558,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -581,11 +581,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -594,7 +594,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -686,7 +686,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -747,7 +747,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -769,8 +769,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -779,14 +779,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -802,7 +802,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -825,11 +825,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -838,7 +838,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -925,7 +925,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", 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 c6e49a079c..30f64adcba 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 @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -400,7 +400,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -461,7 +461,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -471,7 +471,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -481,7 +481,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -491,7 +491,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -513,8 +513,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"iOS-9.3.1\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"iOS-9.3.1\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -523,14 +523,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -546,7 +546,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -569,11 +569,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -582,7 +582,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -671,7 +671,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -732,7 +732,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -754,8 +754,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -764,14 +764,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -787,7 +787,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -810,11 +810,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -823,7 +823,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -910,7 +910,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json index cc77eebc2c..cbb1cc6ad1 100644 --- a/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json @@ -25,7 +25,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "git rev-parse", "stdout": "/path/to/tmp/" }, @@ -46,7 +46,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "", - "[SLAVE_BUILD]/.gclient" + "[START_DIR]/.gclient" ], "name": "write .gclient" }, @@ -56,7 +56,7 @@ "-u", "import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "fix filemodes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -77,7 +77,7 @@ "-u", "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "--url", "https://chromium.googlesource.com/external/swarming.client.git" ], @@ -91,7 +91,7 @@ "origin", "master" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" }, @@ -104,7 +104,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git checkout (swarming_client)" }, { @@ -113,7 +113,7 @@ "rev-parse", "HEAD" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "read revision", "stdout": "/path/to/tmp/", "~followup_annotations": [ @@ -128,7 +128,7 @@ "-d", "-x" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "git clean (swarming_client)" }, { @@ -137,7 +137,7 @@ "submodule", "sync" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule sync (swarming_client)" }, { @@ -148,14 +148,14 @@ "--init", "--recursive" ], - "cwd": "[SLAVE_BUILD]/swarming.client", + "cwd": "[START_DIR]/swarming.client", "name": "submodule update (swarming_client)" }, { "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "--version" ], "name": "swarming.py --version", @@ -173,7 +173,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" + "[START_DIR]/skia/infra/bots/tools/luci-go/linux64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -189,7 +189,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" + "[START_DIR]/skia/infra/bots/tools/luci-go/mac64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -205,7 +205,7 @@ "--bucket", "chromium-luci", "-d", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" + "[START_DIR]/skia/infra/bots/tools/luci-go/win64" ], "env": { "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" @@ -217,10 +217,10 @@ "python", "-u", "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[SLAVE_BUILD]/luci-go" + "[START_DIR]/luci-go" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree luci-go", "~followup_annotations": [ @@ -239,8 +239,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", - "[SLAVE_BUILD]/luci-go", + "[START_DIR]/skia/infra/bots/tools/luci-go", + "[START_DIR]/luci-go", "0" ], "name": "Copy Go binary" @@ -262,7 +262,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir", @@ -284,8 +284,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "Write compile_skia.isolated.gen.json" }, @@ -294,14 +294,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/compile_skia.isolated.gen.json" ], "name": "isolate tests", "~followup_annotations": [ @@ -316,7 +316,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -405,7 +405,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -466,7 +466,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "read skp VERSION" @@ -476,7 +476,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "read skimage VERSION" @@ -486,7 +486,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "read svg VERSION" @@ -496,7 +496,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (2)", @@ -518,8 +518,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "Write test_skia.isolated.gen.json" }, @@ -528,14 +528,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/test_skia.isolated.gen.json" ], "name": "isolate tests (2)", "~followup_annotations": [ @@ -551,7 +551,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated", "abc123" ], "name": "add_isolated_input", @@ -574,11 +574,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-test_skia.isolated" ], "name": "upload new .isolated file for test_skia", "stdout": "/path/to/tmp/" @@ -587,7 +587,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -684,7 +684,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", @@ -745,7 +745,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[SLAVE_BUILD]/swarming_temp_dir", + "[START_DIR]/swarming_temp_dir", "511" ], "name": "makedirs swarming tmp dir (3)", @@ -767,8 +767,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "{\n \"args\": [\n \"--isolate\", \n \"[START_DIR]/skia/infra/bots/upload_dm_results.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[START_DIR]\"\n ], \n \"dir\": \"[START_DIR]\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "Write upload_dm_results_skia.isolated.gen.json" }, @@ -777,14 +777,14 @@ "python", "-u", "RECIPE_MODULE[build::isolate]/resources/isolate.py", - "[SLAVE_BUILD]/swarming.client", + "[START_DIR]/swarming.client", "batcharchive", "--dump-json", "/path/to/tmp/json", "--isolate-server", "https://isolateserver.appspot.com", "--verbose", - "[SLAVE_BUILD]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" + "[START_DIR]/swarming_temp_dir/upload_dm_results_skia.isolated.gen.json" ], "name": "isolate tests (3)", "~followup_annotations": [ @@ -800,7 +800,7 @@ "python", "-u", "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated", "abc123" ], "name": "add_isolated_input (2)", @@ -823,11 +823,11 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/isolateserver.py", + "[START_DIR]/swarming.client/isolateserver.py", "archive", "--isolate-server", "https://isolateserver.appspot.com", - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" + "[START_DIR]/swarming_temp_dir/skia-task-upload_dm_results_skia.isolated" ], "name": "upload new .isolated file for upload_dm_results_skia", "stdout": "/path/to/tmp/" @@ -836,7 +836,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "trigger", "--swarming", "https://chromium-swarm.appspot.com", @@ -928,7 +928,7 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/swarming.client/swarming.py", + "[START_DIR]/swarming.client/swarming.py", "collect", "--swarming", "https://chromium-swarm.appspot.com", diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py index 40b5499cd6..386f5237d8 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -233,11 +233,11 @@ def trigger_task(api, task_name, builder, master, slave, buildnumber, for k, v in properties.iteritems(): extra_args.append('%s=%s' % (k, v)) - isolate_base_dir = api.path['slave_build'] + isolate_base_dir = api.path['start_dir'] dimensions = dimensions or swarm_dimensions(builder_cfg) isolate_blacklist = ['.git', 'out', '*.pyc', '.recipe_deps'] isolate_vars = { - 'WORKDIR': api.path['slave_build'], + 'WORKDIR': api.path['start_dir'], } isolate_file = isolate_file or '%s_skia.isolate' % task_name @@ -266,7 +266,7 @@ def checkout_steps(api): """Run the steps to obtain a checkout of Skia.""" # In this case, we're already running inside a checkout of Skia, so just # report the currently-checked-out commit. - checkout_path = api.path['slave_build'].join('skia') + checkout_path = api.path['start_dir'].join('skia') got_revision = api.git( 'rev-parse', 'HEAD', cwd=checkout_path, stdout=api.raw_io.output(), @@ -278,7 +278,7 @@ def checkout_steps(api): api.path['checkout'] = checkout_path # Write a fake .gclient file if none exists. This is required by .isolates. - dot_gclient = api.path['slave_build'].join('.gclient') + dot_gclient = api.path['start_dir'].join('.gclient') if not api.path.exists(dot_gclient): api.run.writefile(dot_gclient, '') @@ -699,8 +699,8 @@ def test_for_bot(api, builder, mastername, slavename, testname=None): revision='abc123') ) paths = [ - api.path['slave_build'].join('skia'), - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt'), + api.path['start_dir'].join('skia'), + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt'), ] if 'Trybot' in builder: test += api.properties(issue=500, @@ -729,15 +729,15 @@ def test_for_bot(api, builder, mastername, slavename, testname=None): 'upload new .isolated file for housekeeper_skia', stdout=api.raw_io.output('def456 XYZ.isolated')) if 'Win' in builder: - paths.append(api.path['slave_build'].join( + paths.append(api.path['start_dir'].join( 'skia', 'infra', 'bots', 'assets', 'win_toolchain', 'VERSION')) - paths.append(api.path['slave_build'].join( + paths.append(api.path['start_dir'].join( 'skia', 'infra', 'bots', 'assets', 'win_vulkan_sdk', 'VERSION')) - paths.append(api.path['slave_build'].join( + paths.append(api.path['start_dir'].join( 'skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION')) - paths.append(api.path['slave_build'].join( + paths.append(api.path['start_dir'].join( 'skia', 'infra', 'bots', 'assets', 'skp', 'VERSION')) - paths.append(api.path['slave_build'].join( + paths.append(api.path['start_dir'].join( 'skia', 'infra', 'bots', 'assets', 'svg', 'VERSION')) test += api.path.exists(*paths) diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_all.json b/infra/bots/recipes/upload_dm_results.expected/failed_all.json index d88927f05e..7ec0362e4d 100644 --- a/infra/bots/recipes/upload_dm_results.expected/failed_all.json +++ b/infra/bots/recipes/upload_dm_results.expected/failed_all.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CWD]/tmp_upload", + "[START_DIR]/tmp_upload", "511" ], "name": "makedirs tmp dir", @@ -26,8 +26,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "[CWD]/tmp_upload" + "[START_DIR]/dm/dm.json", + "[START_DIR]/tmp_upload" ], "name": "copy dm.json" }, @@ -36,8 +36,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/verbose.log", - "[CWD]/tmp_upload" + "[START_DIR]/dm/verbose.log", + "[START_DIR]/tmp_upload" ], "name": "copy verbose.log" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "name": "rm old dm.json", "~followup_annotations": [ @@ -62,7 +62,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "name": "rm old verbose.log", "~followup_annotations": [ @@ -79,7 +79,7 @@ "-u", "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", "/path/to/tmp/", - "[CWD]/dm/*" + "[START_DIR]/dm/*" ], "name": "find images" }, @@ -87,7 +87,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images", @@ -100,7 +100,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 2)", @@ -113,7 +113,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 3)", @@ -126,7 +126,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 4)", @@ -139,7 +139,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 5)", diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_once.json b/infra/bots/recipes/upload_dm_results.expected/failed_once.json index ddc6a145c2..b6ed1fe3a9 100644 --- a/infra/bots/recipes/upload_dm_results.expected/failed_once.json +++ b/infra/bots/recipes/upload_dm_results.expected/failed_once.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CWD]/tmp_upload", + "[START_DIR]/tmp_upload", "511" ], "name": "makedirs tmp dir", @@ -26,8 +26,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "[CWD]/tmp_upload" + "[START_DIR]/dm/dm.json", + "[START_DIR]/tmp_upload" ], "name": "copy dm.json" }, @@ -36,8 +36,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/verbose.log", - "[CWD]/tmp_upload" + "[START_DIR]/dm/verbose.log", + "[START_DIR]/tmp_upload" ], "name": "copy verbose.log" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "name": "rm old dm.json", "~followup_annotations": [ @@ -62,7 +62,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "name": "rm old verbose.log", "~followup_annotations": [ @@ -79,7 +79,7 @@ "-u", "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", "/path/to/tmp/", - "[CWD]/dm/*" + "[START_DIR]/dm/*" ], "name": "find images" }, @@ -87,7 +87,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images", @@ -100,7 +100,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 2)" @@ -111,7 +111,7 @@ "cp", "-z", "json,log", - "[CWD]/tmp_upload/*", + "[START_DIR]/tmp_upload/*", "gs://skia-infra-gm/dm-json-v1/2012/05/14/12/abc123/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/1337000001" ], "name": "upload JSON and logs" diff --git a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json index b120bf495c..9ea0d30397 100644 --- a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CWD]/tmp_upload", + "[START_DIR]/tmp_upload", "511" ], "name": "makedirs tmp dir", @@ -26,8 +26,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "[CWD]/tmp_upload" + "[START_DIR]/dm/dm.json", + "[START_DIR]/tmp_upload" ], "name": "copy dm.json" }, @@ -36,8 +36,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/verbose.log", - "[CWD]/tmp_upload" + "[START_DIR]/dm/verbose.log", + "[START_DIR]/tmp_upload" ], "name": "copy verbose.log" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "name": "rm old dm.json", "~followup_annotations": [ @@ -62,7 +62,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "name": "rm old verbose.log", "~followup_annotations": [ @@ -79,7 +79,7 @@ "-u", "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", "/path/to/tmp/", - "[CWD]/dm/*" + "[START_DIR]/dm/*" ], "name": "find images" }, @@ -87,7 +87,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" @@ -98,7 +98,7 @@ "cp", "-z", "json,log", - "[CWD]/tmp_upload/*", + "[START_DIR]/tmp_upload/*", "gs://skia-infra-gm/dm-json-v1/2012/05/14/12/abc123/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/1337000001" ], "name": "upload JSON and logs" diff --git a/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json index 3d3a87aea9..03bb50541a 100644 --- a/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CWD]/tmp_upload", + "[START_DIR]/tmp_upload", "511" ], "name": "makedirs tmp dir", @@ -26,8 +26,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "[CWD]/tmp_upload" + "[START_DIR]/dm/dm.json", + "[START_DIR]/tmp_upload" ], "name": "copy dm.json" }, @@ -36,8 +36,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/verbose.log", - "[CWD]/tmp_upload" + "[START_DIR]/dm/verbose.log", + "[START_DIR]/tmp_upload" ], "name": "copy verbose.log" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "name": "rm old dm.json", "~followup_annotations": [ @@ -62,7 +62,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "name": "rm old verbose.log", "~followup_annotations": [ @@ -79,7 +79,7 @@ "-u", "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", "/path/to/tmp/", - "[CWD]/dm/*" + "[START_DIR]/dm/*" ], "name": "find images" }, @@ -87,7 +87,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" @@ -98,7 +98,7 @@ "cp", "-z", "json,log", - "[CWD]/tmp_upload/*", + "[START_DIR]/tmp_upload/*", "gs://skia-infra-gm/trybot/dm-json-v1/2012/05/14/12/abc123/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/1337000001/456789/12" ], "name": "upload JSON and logs" diff --git a/infra/bots/recipes/upload_dm_results.expected/trybot.json b/infra/bots/recipes/upload_dm_results.expected/trybot.json index 5ef42b0d56..3ebc3fa0af 100644 --- a/infra/bots/recipes/upload_dm_results.expected/trybot.json +++ b/infra/bots/recipes/upload_dm_results.expected/trybot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CWD]/tmp_upload", + "[START_DIR]/tmp_upload", "511" ], "name": "makedirs tmp dir", @@ -26,8 +26,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "[CWD]/tmp_upload" + "[START_DIR]/dm/dm.json", + "[START_DIR]/tmp_upload" ], "name": "copy dm.json" }, @@ -36,8 +36,8 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/verbose.log", - "[CWD]/tmp_upload" + "[START_DIR]/dm/verbose.log", + "[START_DIR]/tmp_upload" ], "name": "copy verbose.log" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/dm.json" + "[START_DIR]/dm/dm.json" ], "name": "rm old dm.json", "~followup_annotations": [ @@ -62,7 +62,7 @@ "python", "-u", "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[CWD]/dm/verbose.log" + "[START_DIR]/dm/verbose.log" ], "name": "rm old verbose.log", "~followup_annotations": [ @@ -79,7 +79,7 @@ "-u", "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", "/path/to/tmp/", - "[CWD]/dm/*" + "[START_DIR]/dm/*" ], "name": "find images" }, @@ -87,7 +87,7 @@ "cmd": [ "gsutil", "cp", - "[CWD]/dm/*", + "[START_DIR]/dm/*", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" @@ -98,7 +98,7 @@ "cp", "-z", "json,log", - "[CWD]/tmp_upload/*", + "[START_DIR]/tmp_upload/*", "gs://skia-infra-gm/trybot/dm-json-v1/2012/05/14/12/abc123/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/1337000001/12345/1002" ], "name": "upload JSON and logs" diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index 8e62e244a0..946c77b9b5 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -49,12 +49,12 @@ def RunSteps(api): builder_name = api.properties['buildername'] revision = api.properties['revision'] - results_dir = api.path['cwd'].join('dm') + results_dir = api.path['start_dir'].join('dm') # Move dm.json and verbose.log to their own directory. json_file = results_dir.join(DM_JSON) log_file = results_dir.join(VERBOSE_LOG) - tmp_dir = api.path['cwd'].join('tmp_upload') + tmp_dir = api.path['start_dir'].join('tmp_upload') api.shutil.makedirs('tmp dir', tmp_dir, infra_step=True) api.shutil.copy('copy dm.json', json_file, tmp_dir) api.shutil.copy('copy verbose.log', log_file, tmp_dir) diff --git a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json index d98c93e35f..e004853974 100644 --- a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json @@ -7,7 +7,7 @@ "/path/to/tmp/", "*.json" ], - "cwd": "[CWD]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", + "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", "name": "find results" }, { @@ -18,7 +18,7 @@ "public-read", "-z", "json", - "[CWD]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/nanobench_abc123.json", + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/nanobench_abc123.json", "gs://skia-perf/nano-json-v1/2012/05/14/12/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/nanobench_abc123.json" ], "name": "upload" diff --git a/infra/bots/recipes/upload_nano_results.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/upload_nano_results.expected/recipe_with_gerrit_patch.json index 1aed9e01b8..f55491cf7a 100644 --- a/infra/bots/recipes/upload_nano_results.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/upload_nano_results.expected/recipe_with_gerrit_patch.json @@ -7,7 +7,7 @@ "/path/to/tmp/", "*.json" ], - "cwd": "[CWD]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data", + "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data", "name": "find results" }, { @@ -18,7 +18,7 @@ "public-read", "-z", "json", - "[CWD]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data/nanobench_abc123.json", + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data/nanobench_abc123.json", "gs://skia-perf/trybot/nano-json-v1/2012/05/14/12/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/456789/12/nanobench_abc123.json" ], "name": "upload" diff --git a/infra/bots/recipes/upload_nano_results.expected/trybot.json b/infra/bots/recipes/upload_nano_results.expected/trybot.json index 5ffd4d6207..dd71c716cb 100644 --- a/infra/bots/recipes/upload_nano_results.expected/trybot.json +++ b/infra/bots/recipes/upload_nano_results.expected/trybot.json @@ -7,7 +7,7 @@ "/path/to/tmp/", "*.json" ], - "cwd": "[CWD]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data", + "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data", "name": "find results" }, { @@ -18,7 +18,7 @@ "public-read", "-z", "json", - "[CWD]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data/nanobench_abc123.json", + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data/nanobench_abc123.json", "gs://skia-perf/trybot/nano-json-v1/2012/05/14/12/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/12345/1002/nanobench_abc123.json" ], "name": "upload" diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py index de3d549f81..f55fbce1be 100644 --- a/infra/bots/recipes/upload_nano_results.py +++ b/infra/bots/recipes/upload_nano_results.py @@ -20,7 +20,7 @@ def RunSteps(api): builder_name = api.properties['buildername'] now = api.time.utcnow() - src_path = api.path['cwd'].join( + src_path = api.path['start_dir'].join( 'perfdata', builder_name, 'data') results = api.file.glob( 'find results', diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 0e3f3343c3..545f2a01bf 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -5,17 +5,17 @@ deps { project_id: "build" url: "https://chromium.googlesource.com/chromium/tools/build.git" branch: "master" - revision: "19600e62c4a1217b57a99486ae1cf39cfa10310c" + revision: "7bef3619099d890f888b58f46969cb59dc66eadb" } deps { project_id: "depot_tools" url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git" branch: "master" - revision: "fda50ca02dfd8edea5abd0b9019a87793b80db3e" + revision: "0bfa9ad781d20a6514aa07c0bc711605b10d99fa" } deps { project_id: "recipe_engine" url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git" branch: "master" - revision: "d6020a7ef29d3f7fb77d16a1cd6b32c7b2f09dc2" + revision: "a239f1551fb3ba35d72b9ad4d0cf80ee08c29b22" }