I will be OOO next week. Feel free to update the benchmark it is urgent. Otherwise, I can update to TMBv2 for all metrics when I am back.

ulan: This is not urgent, so we can definitely wait for two weeks. Thanks!

The restriction can be relaxed. It was there to reduce the messiness of the situation. Ethan can help with relaxing it.

Working on a quick patch to relax the restriction. There is one annoying bit, which is that by default, TBMv1 runs all metrics, which we don't want in the TBMv2 scenario. There are still v1 benchmarks that assume this functionality, so we want to keep it.

Currently, this behavior is expressed in timeline_based_measurement.Options, so that implicitly, if you never call SetTimelineBasedMetric OR SetLegacyTimelineBasedMetrics, we populate the list with all available metrics within options.

Instead, here's what we can do:
1. Stop implicitly populating _legacy_timeline_based_metrics within Options
2. When we go to compute metrics, if a TBMv2 metric is specified, also compute any explicitly specified legacy timeline-based metrics. If no TBMv2 metric is specified, and the list of legacy timeline-based metrics is empty, compute all legacy timeline-based metrics.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/56226927344ff0bd246de7fb1f19d2720fa64fa8

commit 56226927344ff0bd246de7fb1f19d2720fa64fa8
Author: catapult-deps-roller <catapult-deps-roller@chromium.org>
Date: Sat Jun 18 02:11:38 2016

Roll src/third_party/catapult/ f7df8568a..713623b39 (11 commits).

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/f7df8568ae1f..713623b39217

$ git log f7df8568a..713623b39 --date=short --no-merges --format='%ad %ae %s'

BUG= 621035 , 620550 

TBR=catapult-sheriff@chromium.org

Review-Url: https://codereview.chromium.org/2079983002
Cr-Commit-Position: refs/heads/master@{#400571}

[modify] https://crrev.com/56226927344ff0bd246de7fb1f19d2720fa64fa8/DEPS

eakuefner: Your proposal SGTM!

Just a quick update: I tried to land this on Friday, but it got reverted (https://codereview.chromium.org/2073363002) because of issues with the smoothness metric, which I guess we could have anticipated -_-

I'll fix the bug and reland it hopefully today.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/fffdf70ea7a1fe12cda8cab108825dffbb3afce0

commit fffdf70ea7a1fe12cda8cab108825dffbb3afce0
Author: catapult-deps-roller <catapult-deps-roller@chromium.org>
Date: Tue Jun 21 01:19:29 2016

Roll src/third_party/catapult/ 18ea79189..ab369f7df (3 commits).

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/18ea79189130..ab369f7df755

$ git log 18ea79189..ab369f7df --date=short --no-merges --format='%ad %ae %s'

BUG=621499, 621035 

TBR=catapult-sheriff@chromium.org

Review-Url: https://codereview.chromium.org/2082913002
Cr-Commit-Position: refs/heads/master@{#400864}

[modify] https://crrev.com/fffdf70ea7a1fe12cda8cab108825dffbb3afce0/DEPS

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/817d4d6609388cee16d0b75b011441a1d6822390

commit 817d4d6609388cee16d0b75b011441a1d6822390
Author: catapult-deps-roller <catapult-deps-roller@chromium.org>
Date: Wed Jun 22 02:11:43 2016

Roll src/third_party/catapult/ bf5baeecf..387907f94 (4 commits).

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/bf5baeecf2d2..387907f944c1

$ git log bf5baeecf..387907f94 --date=short --no-merges --format='%ad %ae %s'

BUG= 621035 ,612151

TBR=catapult-sheriff@chromium.org

Review-Url: https://codereview.chromium.org/2088603003
Cr-Commit-Position: refs/heads/master@{#401164}

[modify] https://crrev.com/817d4d6609388cee16d0b75b011441a1d6822390/DEPS

ulan: friendly ping

Uploaded: https://codereview.chromium.org/2106133002/

This is blocked on https://github.com/catapult-project/catapult/issues/2446

This is also blocked by https://github.com/catapult-project/catapult/issues/2430.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/0a7a65b967c020c7380cba3488b8316b56708ed7

commit 0a7a65b967c020c7380cba3488b8316b56708ed7
Author: ulan <ulan@chromium.org>
Date: Tue Jul 19 13:59:24 2016

[system health] Add desktop browsing story for facebook and change url of twitter story.

*** NOTE TO SHERRIF ***
Regressions are expected in
- system_health.memory_mobile
- system_health.memory_desktop
- v8.browsing_mobile
- v8.browsing_desktop
for the following stories:
- load:social:twitter
- browse:social:twitter

BUG= chromium:621035 

Review-Url: https://codereview.chromium.org/2162473002
Cr-Commit-Position: refs/heads/master@{#406267}

[modify] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/data/system_health_desktop.json
[add] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/data/system_health_desktop_018.wpr.sha1
[add] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/data/system_health_desktop_019.wpr.sha1
[modify] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/data/system_health_mobile.json
[add] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/data/system_health_mobile_022.wpr.sha1
[add] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/data/system_health_mobile_023.wpr.sha1
[modify] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/system_health/browsing_stories.py
[modify] https://crrev.com/0a7a65b967c020c7380cba3488b8316b56708ed7/tools/perf/page_sets/system_health/loading_stories.py

Ignore the last CL, I mixed up bug ID: the correct one is 627377

Ulan, looks like the work on the blocking catapult issues has been completed. Could you check if that's enough to complete the migration of this benchmark?

Issie https://github.com/catapult-project/catapult/issues/2446 is still open.

I checked on chrome TOT (revision 408159) and see only Idle/Response phases in oortonline.

I see that Alex319 has CL in flight for updating user model: https://codereview.chromium.org/2169963002

https://codereview.chromium.org/2169963002 landed on Friday. What is the current situation?

Replied in https://github.com/catapult-project/catapult/issues/2446

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/556cffc13ef8cf71b182e0143f89d2f68c449201

commit 556cffc13ef8cf71b182e0143f89d2f68c449201
Author: ulan <ulan@chromium.org>
Date: Mon Aug 08 11:29:13 2016

Port oortonline_tbm to TBMv2.

BUG= 621035 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.perf:android_s5_perf_cq;master.tryserver.chromium.perf:linux_perf_cq;master.tryserver.chromium.perf:mac_retina_perf_cq

Review-Url: https://codereview.chromium.org/2106133002
Cr-Commit-Position: refs/heads/master@{#410329}

[modify] https://crrev.com/556cffc13ef8cf71b182e0143f89d2f68c449201/tools/perf/benchmarks/oortonline.py