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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_linux_angle_dbg_ng.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_chromium_android_linux_android_rel_ng.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_linux_angle_rel_ng.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_chromium_angle_linux_angle_dbg_ng.json

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

index e3809d06468fe4b284211db44f5d9eeb90dc7409..c91697d314b50c400d83f77903a6cee2698bdf73 100644

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

+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_angle_linux_angle_dbg_ng.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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",

+ "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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",

"--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/angle@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": "archive_gpu_tests=1 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' internal_gles2_conform_tests=1 proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",

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

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

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

@@ -190,7 +196,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",

"--",

@@ -198,10 +204,11 @@

"Debug",

"--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_angle_dbg_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.angle\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"

+ "cwd": "[SLAVE_BUILD]",

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

"~followup_annotations": [

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

@@ -213,12 +220,13 @@

"python",

"-u",

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

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

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

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read test spec",

"~followup_annotations": [

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

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

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

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

]

@@ -230,7 +238,7 @@

"--cached",

"--name-only"

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

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

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

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

"~followup_annotations": [

@@ -244,9 +252,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'@@@",

@@ -269,6 +278,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "analyze",

"~followup_annotations": [

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

@@ -289,6 +299,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "mark: before_tests"

{