Decommission "Android FYI Release (Nexus 6P)" and trybot

Bug: 1148989
Change-Id: I2a9f46f26eb076cc73166db300d14a1feb63fa28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541579Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827990}

infra/config/generated/commit-queue.cfg

@@ -643,10 +643,6 @@ config_groups {
         name: "chromium/try/gpu-fyi-try-android-m-nexus-5x-skgl-64"
         includable_only: true
       }
-      builders {
-        name: "chromium/try/gpu-fyi-try-android-m-nexus-6p-64"
-        includable_only: true
-      }
       builders {
         name: "chromium/try/gpu-fyi-try-android-m-nexus-9-64"
         includable_only: true

infra/config/generated/cr-buildbucket.cfg

@@ -864,53 +864,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Android FYI Release (Nexus 6P)"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu.fyi\",\"perf_dashboard_machine_group\":\"ChromiumGPUFYI\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 21600
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 50
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
     builders {
       name: "Android FYI Release (Nexus 9)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -28145,60 +28098,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "gpu-fyi-try-android-m-nexus-6p-64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.gpu.android.nexus6p.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
-      execution_timeout_secs: 21600
-      expiration_secs: 7200
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 50
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
     builders {
       name: "gpu-fyi-try-android-m-nexus-9-64"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -7225,11 +7225,6 @@ consoles {
     category: "Android|M64|QCOM"
     short_name: "N5X"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 6P)"
-    category: "Android|M64|QCOM"
-    short_name: "N6P"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Android FYI Release (Nexus 9)"
     category: "Android|M64|NVDA"
@@ -11714,9 +11709,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-skgl-64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-6p-64"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-9-64"
   }
@@ -12549,9 +12541,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-5x-skgl-64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-6p-64"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-android-m-nexus-9-64"
   }

infra/config/generated/luci-scheduler.cfg

@@ -216,16 +216,6 @@ job {
     builder: "Android FYI Release (Nexus 6)"
   }
 }
-job {
-  id: "Android FYI Release (Nexus 6P)"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android FYI Release (Nexus 6P)"
-  }
-}
 job {
   id: "Android FYI Release (Nexus 9)"
   realm: "ci"
@@ -6321,7 +6311,6 @@ trigger {
   triggers: "Android FYI Release (Nexus 5)"
   triggers: "Android FYI Release (Nexus 5X)"
   triggers: "Android FYI Release (Nexus 6)"
-  triggers: "Android FYI Release (Nexus 6P)"
   triggers: "Android FYI Release (Nexus 9)"
   triggers: "Android FYI Release (Pixel 2)"
   triggers: "Android FYI SkiaRenderer GL (Nexus 5X)"

infra/config/subprojects/chromium/ci.star

@@ -3352,14 +3352,6 @@ ci.gpu_fyi_linux_builder(
     ),
 )
 
-ci.gpu_fyi_linux_builder(
-    name = "Android FYI Release (Nexus 6P)",
-    console_view_entry = ci.console_view_entry(
-        category = "Android|M64|QCOM",
-        short_name = "N6P",
-    ),
-)
-
 ci.gpu_fyi_linux_builder(
     name = "Android FYI Release (Nexus 9)",
     console_view_entry = ci.console_view_entry(

infra/config/subprojects/chromium/gpu.try.star

@@ -79,11 +79,6 @@ gpu_android_builder(
     pool = "luci.chromium.gpu.android.nexus5x.try",
 )
 
-gpu_android_builder(
-    name = "gpu-fyi-try-android-m-nexus-6p-64",
-    pool = "luci.chromium.gpu.android.nexus6p.try",
-)
-
 gpu_android_builder(
     name = "gpu-fyi-try-android-m-nexus-9-64",
     pool = "luci.chromium.gpu.android.nexus9.try",

testing/buildbot/mixins.pyl

@@ -169,15 +169,6 @@
       ],
     }
   },
-  'angler': {
-    # Nexus 6P
-    'swarming': {
-      'dimensions': {
-        'device_type': 'angler',
-        'os': 'Android',
-      },
-    },
-  },
   'arm64': {
     'swarming': {
       'dimensions': {

testing/buildbot/test_suite_exceptions.pyl

@@ -90,7 +90,6 @@
     'remove_from': [
       'Android FYI Release (Nexus 5)',  # crbug.com/915429
       'Android FYI Release (Nexus 6)',  # anglebug.com/2433
-      'Android FYI Release (Nexus 6P)', # anglebug.com/4909
       'Linux FYI GPU TSAN Release',  # crbug.com/950542
     ],
   },

testing/buildbot/waterfalls.pyl

@@ -3487,21 +3487,6 @@
           'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },
-      'Android FYI Release (Nexus 6P)': {
-        'browser_config': 'android-chromium',
-        'os_type': 'android',
-        'skip_merge_script': True,
-        'mixins': [
-          'angler',
-          'gpu-swarming-pool',
-          'marshmallow_generic',
-        ],
-        'test_suites': {
-          'gtest_tests': 'gpu_fyi_android_gtests',
-          'isolated_scripts': 'gpu_angle_perf_smoke_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
-        },
-      },
       'Android FYI Release (Nexus 9)': {
         'browser_config': 'android-chromium',
         'os_type': 'android',

tools/mb/mb_config.pyl

@@ -443,7 +443,6 @@
       'Android FYI Release (Nexus 5)': 'gpu_tests_android_release_trybot',
       'Android FYI Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (Nexus 6)': 'gpu_tests_android_release_trybot',
-      'Android FYI Release (Nexus 6P)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (Nexus 9)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (NVIDIA Shield TV)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (Pixel 2)': 'gpu_tests_android_release_trybot',
@@ -805,7 +804,6 @@
       'gpu-fyi-try-android-m-nexus-5x-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-m-nexus-5x-deqp-64': 'angle_deqp_android_release_trybot_arm64',
       'gpu-fyi-try-android-m-nexus-5x-skgl-64': 'gpu_tests_android_release_trybot_arm64',
-      'gpu-fyi-try-android-m-nexus-6p-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-m-nexus-9-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-n-nvidia-shield-tv-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-p-pixel-2-32': 'gpu_tests_android_release_trybot',

tools/mb/mb_config_expectations/chromium.gpu.fyi.json

@@ -131,20 +131,6 @@
       "use_static_angle": true
     }
   },
-  "Android FYI Release (Nexus 6P)": {
-    "gn_args": {
-      "dcheck_always_on": true,
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "arm64",
-      "target_os": "android",
-      "use_goma": true,
-      "use_static_angle": true
-    }
-  },
   "Android FYI Release (Nexus 9)": {
     "gn_args": {
       "dcheck_always_on": true,

tools/mb/mb_config_expectations/tryserver.chromium.android.json

@@ -740,20 +740,6 @@
       "use_static_angle": true
     }
   },
-  "gpu-fyi-try-android-m-nexus-6p-64": {
-    "gn_args": {
-      "dcheck_always_on": true,
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "arm64",
-      "target_os": "android",
-      "use_goma": true,
-      "use_static_angle": true
-    }
-  },
   "gpu-fyi-try-android-m-nexus-9-64": {
     "gn_args": {
       "dcheck_always_on": true,