GitLab

This reverts commit 30d16f41.

Reason for revert: crbug/1163513 android perf build is broken due to missing module six.

Original change's description:
> Roll Catapult from de6e3a9d85af to 6c876045de14 (1 revision)
>
> https://chromium.googlesource.com/catapult.git/+log/de6e3a9d85af..6c876045de14
>
> 2021-01-05 jbudorick@chromium.org devil: make devil_env_test pass under py3.
>
> If this roll has caused a breakage, revert this CL and stop the roller
> using the controls here:
> https://autoroll.skia.org/r/catapult-autoroll
> Please CC matthewdeluca@google.com on the revert to ensure that a human
> is aware of the problem.
>
> To report a problem with the AutoRoller itself, please file a bug:
> https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
>
> Documentation for the AutoRoller is here:
> https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md
>
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:chromeos-kevin-rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> Bug: chromium:1007101
> Tbr: matthewdeluca@google.com
> Change-Id: I2e0359bddda1f8287cfd881439299926ad0fc2e0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611890
> Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/master@{#840364}

TBR=chromium-autoroll@skia-public.iam.gserviceaccount.com,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,matthewdeluca@chromium.org

Change-Id: I85025d04a0f56ef302e06b658a2da6c66a9ff61c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1007101
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:chromeos-kevin-rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612520Reviewed-by: Stephen Nusko <nuskos@chromium.org>
Commit-Queue: Stephen Nusko <nuskos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840592}