Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json

Issue 1916263003: Reland "Skia: Maintain a checkout on swarming (compile) bots" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Fix expectations after roll Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json
diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json
index 54ac35dce70f2661c1174a57d9e8644b607eaca8..7adfaf352f42b6732361bd72a3166d31b59c561e 100644
--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json
@@ -3,11 +3,120 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
+ "\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",
+ "[CUSTOM_/_B_CACHE]",
+ "511"
+ ],
+ "name": "makedirs checkout_path",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "config",
+ "--spec",
+ "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+ ],
+ "cwd": "[CUSTOM_/_B_CACHE]",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts"
+ },
+ "name": "gclient setup"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/gclient_safe_revert.py",
+ ".",
+ "[DEPOT_TOOLS]/gclient"
+ ],
+ "cwd": "[CUSTOM_/_B_CACHE]",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts"
+ },
+ "name": "gclient revert"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "sync",
+ "--nohooks",
+ "--force",
+ "--verbose",
+ "--delete_unversioned_trees",
+ "--revision",
+ "skia@abc123",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "cwd": "[CUSTOM_/_B_CACHE]",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts"
+ },
+ "name": "gclient sync",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[DEPOT_TOOLS]/apply_issue.py",
+ "-r",
+ "[CUSTOM_/_B_CACHE]/skia",
+ "-i",
+ "500",
+ "-p",
+ "1",
+ "-s",
+ "https://codereview.chromium.org",
+ "--no-auth"
+ ],
+ "name": "apply_issue",
+ "~followup_annotations": [
+ "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CUSTOM_/_B_CACHE]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
"Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CUSTOM_/_B_CACHE]/skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -52,8 +161,9 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
- "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts",
+ "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
},
"name": "has ccache?",
"stdout": "/path/to/tmp/json",
@@ -83,16 +193,17 @@
"arm_v7_neon",
"--gcc"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CUSTOM_/_B_CACHE]/skia",
"env": {
"ANDROID_HOME": "/b/android-sdk-linux",
"ANDROID_SDK_ROOT": "/b/android-sdk-linux",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
- "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
+ "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
},
"name": "build dm"
},
@@ -104,16 +215,17 @@
"arm_v7_neon",
"--gcc"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CUSTOM_/_B_CACHE]/skia",
"env": {
"ANDROID_HOME": "/b/android-sdk-linux",
"ANDROID_SDK_ROOT": "/b/android-sdk-linux",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
- "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+ "PATH": "[DEPOT_TOOLS]:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PYTHONPATH": "[BUILD]/scripts",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
+ "SKIA_OUT": "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
},
"name": "build nanobench"
},
@@ -122,7 +234,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', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa']\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 print 'Copying build product %s to %s' % (f, dst)\n shutil.move(f, dst)\n",
- "[SLAVE_BUILD]/out/Debug",
+ "[CUSTOM_/_B_CACHE]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot/Debug",
"[SWARM_OUT_DIR]/out/Debug"
],
"name": "copy build products",

Powered by Google App Engine
This is Rietveld 408576698