scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: 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

« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_pass.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json

diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json

index 3181721f167aeffdeed71902d85d1f6eac4170a1..f7e49d86617f631c52c9cdf3f818efe94236ee73 100644

--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json

+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_rel_fail.json

@@ -11,13 +11,13 @@

"--slave",

"TestSlavename",

"--spec",

- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",

+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",

"--root",

"src",

"--revision_mapping_file",

"{\"src\": \"got_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",

- "[ROOT]/b/build/slave/cache_dir",

+ "[GIT_CACHE]",

"--issue",

"12853011",

"--patchset",

@@ -32,6 +32,7 @@

"src/third_party/WebKit@HEAD",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -106,6 +107,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "ensure_goma"

{

@@ -116,16 +118,17 @@

"--platform",

"linux-amd64",

"--dest-directory",

- "[CWD]/cipd",

+ "[SLAVE_BUILD]/cipd",

"--json-output",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "ensure_goma.install cipd",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",

"@@@STEP_LOG_LINE@json.output@{@@@",

- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",

"@@@STEP_LOG_LINE@json.output@}@@@",

"@@@STEP_LOG_END@json.output@@@"

@@ -133,10 +136,10 @@

{

"cmd": [

- "fake_slave_build/cipd",

+ "[SLAVE_BUILD]/cipd/cipd",

"ensure",

"--root",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--list",

"infra_internal/goma/client/linux-amd64 release",

"--json-output",

@@ -144,6 +147,7 @@

"--service-account-json",

"/creds/service_accounts/service-account-goma-client.json"

+ "cwd": "[SLAVE_BUILD]",

"name": "ensure_goma.ensure_installed",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@",

@@ -162,9 +166,10 @@

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/swarming_client/swarming.py",

+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",

"--version"

+ "cwd": "[SLAVE_BUILD]",

"name": "swarming.py --version",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -178,10 +183,11 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

"GYP_CHROMIUM_NO_ACTION": "1",

- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",

+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks (with patch)"

@@ -190,17 +196,18 @@

"cmd": [

"python",

"-u",

- "[CWD]/src/testing/scripts/get_compile_targets.py",

+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",

"--output",

"/path/to/tmp/json",

"--",

"--build-config-fs",

"Release",

"--paths",

- "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

+ "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

"--properties",

"{\"buildername\": \"linux_blink_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"

+ "cwd": "[SLAVE_BUILD]",

"name": "get compile targets for scripts",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{}@@@",

@@ -212,12 +219,13 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[CWD]/src/testing/buildbot/chromium.webkit.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read test spec",

"~followup_annotations": [

- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.webkit.json@@@",

+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json@@@",

"@@@STEP_LOG_LINE@json.output@{}@@@",

"@@@STEP_LOG_END@json.output@@@"

]

@@ -229,7 +237,7 @@

"--cached",

"--name-only"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "git diff to analyze patch",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -243,9 +251,10 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[CWD]/src/testing/buildbot/trybot_analyze_config.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read filter exclusion spec",

"~followup_annotations": [

"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",

@@ -268,6 +277,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "analyze",

"~followup_annotations": [

"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",

@@ -299,24 +309,26 @@

"python",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "cleanup_temp"

{

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/mb/mb.py",

+ "[SLAVE_BUILD]/src/tools/mb/mb.py",

"gen",

"-m",

"tryserver.blink",

"-b",

"linux_blink_rel",

"--config-file",

- "[CWD]/src/tools/mb/mb_config.pyl",

+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "generate_build_files (with patch)"

{

@@ -334,9 +346,9 @@

"--target",

"Release",

"--src-dir",

- "[CWD]/src",

+ "[SLAVE_BUILD]/src",

"--goma-cache-dir",

- "[ROOT]/b/build/slave/goma_cache",

+ "[GOMA_CACHE]",

"--build-tool",

"ninja",

"--compiler",

@@ -346,13 +358,14 @@

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--goma-fail-fast",

"--goma-disable-local-fallback",

"--ninja-ensure-up-to-date",

"--",

"blink_tests"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"

@@ -368,6 +381,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "mark: before_tests"

{

@@ -387,13 +401,13 @@

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[ROOT]/b/build/scripts/slave/chromium/layout_test_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",

"--target",

"Release",

"-o",

- "[CWD]/layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[CWD]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--json-test-results",

"/path/to/tmp/json",

"--test-results-server",

@@ -405,6 +419,7 @@

"--step-name",

"webkit_tests (with patch)"

+ "cwd": "[SLAVE_BUILD]",

"name": "webkit_tests (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 5",

@@ -416,11 +431,11 @@

"cmd": [

"python",

"-u",

- "[ROOT]/b/build/scripts/slave/chromium/archive_layout_test_results.py",

+ "[BUILD]/scripts/slave/chromium/archive_layout_test_results.py",

"--results-dir",

- "[CWD]/layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[CWD]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--build-number",

"571",

"--builder-name",

@@ -428,6 +443,7 @@

"--gs-bucket",

"gs://chromium-layout-test-archives"

+ "cwd": "[SLAVE_BUILD]",

"name": "archive_webkit_tests_results",

"~followup_annotations": [

"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/571/layout-test-results/results.html@@@",

@@ -446,13 +462,13 @@

"--slave",

"TestSlavename",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

- "[ROOT]/b/build/slave/cache_dir",

+ "[GIT_CACHE]",

"--rietveld_server",

"https://codereview.chromium.org",

"--output_json",

@@ -464,6 +480,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -531,10 +548,11 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

"GYP_CHROMIUM_NO_ACTION": "1",

- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",

+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks (without patch)"

@@ -543,18 +561,19 @@

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/mb/mb.py",

+ "[SLAVE_BUILD]/src/tools/mb/mb.py",

"gen",

"-m",

"tryserver.blink",

"-b",

"linux_blink_rel",

"--config-file",

- "[CWD]/src/tools/mb/mb_config.pyl",

+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "generate_build_files (without patch)"

{

@@ -572,9 +591,9 @@

"--target",

"Release",

"--src-dir",

- "[CWD]/src",

+ "[SLAVE_BUILD]/src",

"--goma-cache-dir",

- "[ROOT]/b/build/slave/goma_cache",

+ "[GOMA_CACHE]",

"--build-tool",

"ninja",

"--compiler",

@@ -584,13 +603,14 @@

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--goma-fail-fast",

"--goma-disable-local-fallback",

"--ninja-ensure-up-to-date",

"--",

"blink_tests"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"

@@ -617,13 +637,13 @@

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[ROOT]/b/build/scripts/slave/chromium/layout_test_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",

"--target",

"Release",

"-o",

- "[CWD]/layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[CWD]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--json-test-results",

"/path/to/tmp/json",

"--test-results-server",

@@ -639,6 +659,7 @@

"--skipped",

"always"

+ "cwd": "[SLAVE_BUILD]",

"name": "webkit_tests (without patch)",

"~followup_annotations": [

"step returned non-zero exit code: 5",

@@ -652,6 +673,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "webkit_tests (retry summary)",

"~followup_annotations": [

"@@@STEP_TEXT@<br/>ignored:<br/>bad/totally-bad-probably.html<br/>tricky/totally-maybe-not-awesome.html<br/>@@@",