Refactor chromium.perf recipe configs.

Refactor chromium.perf recipe configs.

Unify our gclient and chromium configs to use only one or two configs. This reduces the risk of errors and ensures they're consistent across our three masters (chromium.perf, chromium.perf.fyi, tryserver.chromium.perf).

Remove some legacy cruft that's not used anymore.


BUG=611484
Committed: https://chromium.googlesource.com/chromium/tools/build/+/bc11eedbd74022297d9a64be416ad6baef1f4ef8

[dtu, 2016-06-06 22:35:32]

dtu@chromium.org changed reviewers:
+ aiolos@chromium.org, prasadv@chromium.org

[dtu, 2016-06-06 22:35:35]

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
File
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
(right):

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json:14:
"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'}]\ntarget_os
= ['android']",
gclient checkouts now managed to match chromium builders. (It's the default.)
llvm_url removed. I don't know what it was used for.
src/data/page_cycler removed from checkout. We don't use it anymore.

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json:199:
"name": "clean local files",
Not sure what these are for. I'm sure they're fine :P

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json:223:
"name": "tree truth steps"
Shrug.

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json:279:
"chromium_builder_perf"
--goma-hermetic fallback removed from perf bots (but not bisect bots).

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
File
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json
(right):

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json:14:
"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'}]\ntarget_os
= ['android']",
We don't really care about what happens with the Android bot configs here. We
don't use this recipe for our Android bots.

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json:171:
"GYP_CHROMIUM_NO_ACTION": "1",
GYP should do nothing on our bots. They are all using GN instead. See:
https://bugs.chromium.org/p/chromium/issues/detail?id=569975

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
File
scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_7_Intel_GPU_Perf__Xeon_.json
(right):

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_7_Intel_GPU_Perf__Xeon_.json:117:
"name": "ensure_goma"
goma re-enabled for FYI builders. It was "temporarily" disabled in
https://codereview.chromium.org/949983002 .

[dtu, 2016-06-06 22:35:59]

Description was changed from

==========
Refactor chromium.perf configs.


BUG=611484
==========

to

==========
Refactor chromium.perf recipe configs.

Unify our gclient and chromium configs to use only one or two configs. This
reduces the risk of errors and ensures they're consistent across our three
masters.

Remove some legacy cruft that's not used anymore.


BUG=611484
==========

[dtu, 2016-06-08 00:46:05]

Description was changed from

==========
Refactor chromium.perf recipe configs.

Unify our gclient and chromium configs to use only one or two configs. This
reduces the risk of errors and ensures they're consistent across our three
masters.

Remove some legacy cruft that's not used anymore.


BUG=611484
==========

to

==========
Refactor chromium.perf recipe configs.

Unify our gclient and chromium configs to use only one or two configs. This
reduces the risk of errors and ensures they're consistent across our three
masters (chromium.perf, chromium.perf.fyi, tryserver.chromium.perf).

Remove some legacy cruft that's not used anymore.


BUG=611484
==========

[dtu, 2016-06-08 01:04:31]

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
File
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
(right):

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json:14:
"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'}]\ntarget_os
= ['android']",
On 2016/06/06 22:35:34, dtu wrote:
> gclient checkouts now managed to match chromium builders. (It's the default.)
> llvm_url removed. I don't know what it was used for.
> src/data/page_cycler removed from checkout. We don't use it anymore.

llvm_url: seems like it was added to match the pre-recipe builders, don't care.
https://codereview.chromium.org/382903002

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
File
scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_7_Intel_GPU_Perf__Xeon_.json
(right):

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_7_Intel_GPU_Perf__Xeon_.json:117:
"name": "ensure_goma"
On 2016/06/06 22:35:34, dtu wrote:
> goma re-enabled for FYI builders. It was "temporarily" disabled in
> https://codereview.chromium.org/949983002 .

Also ensure_goma fixes this bug for this bot:
https://bugs.chromium.org/p/chromium/issues/detail?id=615339

[aiolos (Not reviewing), 2016-06-08 01:06:39]

lgtm

I don't understand the tree truth changes, but otherwise this seems fine.

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
File
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
(right):

https://codereview.chromium.org/2030713004/diff/40001/scripts/slave/recipes/c...
scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json:14:
"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'}]\ntarget_os
= ['android']",
On 2016/06/06 22:35:34, dtu wrote:
> gclient checkouts now managed to match chromium builders. (It's the default.)
> llvm_url removed. I don't know what it was used for.
> src/data/page_cycler removed from checkout. We don't use it anymore.

Looked at this offline with Dave, and the cl that added llvm_url was doing so to
make it consistent with the non-recipe solution. Seems fine to remove.

[dtu, 2016-06-13 20:18:30]

The CQ bit was checked by dtu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-13 20:18:40]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2030713004/40001

[commit-bot: I haz the power, 2016-06-13 20:22:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-13 20:22:51]

Dry run: Try jobs failed on following builders:
  Build Presubmit on tryserver.infra (JOB_FAILED,
https://build.chromium.org/p/tryserver.infra/builders/Build%20Presubmit/build...)

[iannucci, 2016-07-21 20:59:28]

iannucci@chromium.org changed reviewers:
+ iannucci@chromium.org

[iannucci, 2016-07-21 20:59:29]

lgtm

[dtu, 2016-07-26 21:52:23]

The CQ bit was checked by dtu@chromium.org

[dtu, 2016-07-26 21:52:24]

The patchset sent to the CQ was uploaded after l-g-t-m from aiolos@chromium.org,
iannucci@chromium.org
Link to the patchset: https://codereview.chromium.org/2030713004/#ps60001
(title: "Rebase, hope it's right :)")

[commit-bot: I haz the power, 2016-07-26 21:52:36]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-26 22:00:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-26 22:00:26]

Try jobs failed on following builders:
  Build Presubmit on master.tryserver.infra (JOB_FAILED,
https://build.chromium.org/p/tryserver.infra/builders/Build%20Presubmit/build...)

[dtu, 2016-07-26 22:17:02]

dtu@chromium.org changed reviewers:
+ robertocn@chromium.org

[dtu, 2016-07-26 22:17:03]

robertocn, owners

[RobertoCN, 2016-07-26 22:49:53]

rs-lgtm

[dtu, 2016-07-26 23:03:29]

The CQ bit was checked by dtu@chromium.org

[commit-bot: I haz the power, 2016-07-26 23:03:39]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-26 23:07:32]

Description was changed from

==========
Refactor chromium.perf recipe configs.

Unify our gclient and chromium configs to use only one or two configs. This
reduces the risk of errors and ensures they're consistent across our three
masters (chromium.perf, chromium.perf.fyi, tryserver.chromium.perf).

Remove some legacy cruft that's not used anymore.


BUG=611484
==========

to

==========
Refactor chromium.perf recipe configs.

Unify our gclient and chromium configs to use only one or two configs. This
reduces the risk of errors and ensures they're consistent across our three
masters (chromium.perf, chromium.perf.fyi, tryserver.chromium.perf).

Remove some legacy cruft that's not used anymore.


BUG=611484

Committed:
https://chromium.googlesource.com/chromium/tools/build/+/bc11eedbd74022297d9a...
==========

[commit-bot: I haz the power, 2016-07-26 23:07:33]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/tools/build/+/bc11eedbd74022297d9a...