| Index: scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_android_deterministic.json
|
| diff --git a/scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_android_deterministic.json b/scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_android_deterministic.json
|
| deleted file mode 100644
|
| index 63ca2470aa45fead3df1d0680e38b9c6c90c2c22..0000000000000000000000000000000000000000
|
| --- a/scripts/slave/recipes/deterministic_build.expected/full_chromium_swarm_android_deterministic.json
|
| +++ /dev/null
|
| @@ -1,350 +0,0 @@
|
| -[
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
|
| - "[SLAVE_BUILD]"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "cleanup index.lock",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path, cur_file)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| - "--master",
|
| - "chromium.swarm",
|
| - "--builder",
|
| - "android_deterministic",
|
| - "--slave",
|
| - "TestSlavename",
|
| - "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']",
|
| - "--root",
|
| - "src",
|
| - "--revision_mapping_file",
|
| - "{\"src\": \"got_src_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| - "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| - "--output_json",
|
| - "/path/to/tmp/json",
|
| - "--revision",
|
| - "src@204787",
|
| - "--force",
|
| - "--output_manifest"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "bot_update",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Some step text@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"204787\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_src_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_src_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_src_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_src_revision_cp@\"refs/heads/master@{#170242}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "clean local files",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient runhooks"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| - "--ninja-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-jsonstatus",
|
| - "/path/to/tmp/json",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--clobber",
|
| - "--",
|
| - "all"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "First build",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| - "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "remove_build_metadata",
|
| - "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_WARNINGS@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "[SLAVE_BUILD]/src/out/Release.1"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.1",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[2]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ shutil.rmtree(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.move(sys.argv[1], sys.argv[2])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient runhooks (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| - "--ninja-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-jsonstatus",
|
| - "/path/to/tmp/json",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--clobber",
|
| - "--",
|
| - "all"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "Second build",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| - "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "remove_build_metadata (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "[SLAVE_BUILD]/src/out/Release.2"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.2",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[2]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ shutil.rmtree(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.move(sys.argv[1], sys.argv[2])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::isolate]/resources/compare_build_artifacts.py",
|
| - "--first-build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release.1",
|
| - "--second-build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release.2",
|
| - "--target-platform",
|
| - "android"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "compare_build_artifacts"
|
| - },
|
| - {
|
| - "name": "$result",
|
| - "recipe_result": null,
|
| - "status_code": 0
|
| - }
|
| -]
|
|
|