scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.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/example/hierarchical.expected/basic.json ('k') | scripts/slave/recipes/findit/chromium/compile.expected/compile_default_targets.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json

diff --git a/scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json b/scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json

index d8763d60e2d4bb7d3c3f070a4e2a7a5feaddc63e..33fac22467c1726893ca4fb1829fc68bd1bb2bc8 100644

--- a/scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json

+++ b/scripts/slave/recipes/findit/chromium/compile.expected/compile_affected_targets_only.json

@@ -11,19 +11,20 @@

"--slave",

"build1-a1",

"--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]",

"--output_json",

"/path/to/tmp/json",

"--revision",

"src@r1",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -97,6 +98,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "ensure_goma"

{

@@ -107,16 +109,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@@@"

@@ -124,10 +127,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",

@@ -135,6 +138,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@@@",

@@ -153,9 +157,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": [

@@ -169,10 +174,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": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",

+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",

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

"name": "gclient runhooks"

@@ -181,7 +187,7 @@

"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",

"--",

@@ -189,10 +195,11 @@

"Release",

"--use-src-side-runtest-py",

"--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_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"

+ "cwd": "[SLAVE_BUILD]",

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

"~followup_annotations": [

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

@@ -204,12 +211,13 @@

"python",

"-u",

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

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

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

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read test spec",

"~followup_annotations": [

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

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

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

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

]

@@ -221,7 +229,7 @@

"--format=%H",

"r0..r1"

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

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

"name": "git commits in range",

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

"~followup_annotations": [

@@ -231,6 +239,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1"

{

@@ -245,19 +254,20 @@

"--slave",

"build1-a1",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

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

+ "[GIT_CACHE]",

"--output_json",

"/path/to/tmp/json",

"--revision",

"src@r1",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -332,6 +342,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.ensure_goma",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -345,16 +356,17 @@

"--platform",

"linux-amd64",

"--dest-directory",

- "[CWD]/cipd",

+ "[SLAVE_BUILD]/cipd",

"--json-output",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.ensure_goma.install cipd",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@2@@@",

"@@@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@@@"

@@ -362,10 +374,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",

@@ -373,6 +385,7 @@

"--service-account-json",

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

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.ensure_goma.ensure_installed",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@2@@@",

@@ -394,10 +407,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": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",

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

"name": "test r1.gclient runhooks",

@@ -409,7 +423,7 @@

"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",

"--",

@@ -417,10 +431,11 @@

"Release",

"--use-src-side-runtest-py",

"--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_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.get compile targets for scripts",

"~followup_annotations": [

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

@@ -433,13 +448,14 @@

"python",

"-u",

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

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

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

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.read test spec",

"~followup_annotations": [

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

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

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

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

"@@@STEP_LOG_LINE@json.output@ \"Linux Builder\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"additional_compile_targets\": [@@@",

@@ -461,7 +477,7 @@

"r1",

"--name-only"

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

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

"name": "test r1.git diff to analyze commit",

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

"~followup_annotations": [

@@ -475,9 +491,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": "test r1.read filter exclusion spec",

"~followup_annotations": [

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

@@ -500,7 +517,7 @@

"cmd": [

"python",

"-u",

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

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

"analyze",

"-m",

"chromium.linux",

@@ -511,6 +528,7 @@

"{\"additional_compile_targets\": [\"a\", \"a_run\", \"b\", \"b_run\", \"chromium_swarm_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": []}",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.analyze",

"~followup_annotations": [

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

@@ -560,6 +578,7 @@

"python",

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

+ "cwd": "[SLAVE_BUILD]",

"name": "test r1.cleanup_temp",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -569,18 +588,19 @@

"cmd": [

"python",

"-u",

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

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

"gen",

"-m",

"chromium.linux",

"-b",

"Linux Builder",

"--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": "test r1.generate_build_files",

"~followup_annotations": [

"@@@STEP_NEST_LEVEL@1@@@"

@@ -601,9 +621,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",

@@ -613,12 +633,13 @@

"--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",

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

"--",

"a",

"a_run"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -635,6 +656,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "report",

"~followup_annotations": [

"@@@STEP_LOG_LINE@report@{@@@",