Remove android L ci bot.

Deprecate Android lollipop ci bot. Moves some compile targets to marshmallow bots. Bug: 1255748 Change-Id: I41aff7c9ccb221a636582eb7487f8c8821bec4b2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3227595 Reviewed-by: Tommy Nyquist <nyquist@chromium.org> Reviewed-by: Haiyang Pan <hypan@google.com> Commit-Queue: Ben joyce <bjoyce@chromium.org> Cr-Commit-Position: refs/heads/main@{#932308}
marcosholgado · Oct 16, 2021 · 68c5c85 · 68c5c85
1 parent 0ac1208
commit 68c5c85
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 3,147 deletions.
diff --git a/infra/config/generated/builders/ci/android-lollipop-arm-rel/properties.textpb b/infra/config/generated/builders/ci/android-lollipop-arm-rel/properties.textpb
diff --git a/infra/config/generated/builders/try/android-lollipop-arm-rel/properties.textpb b/infra/config/generated/builders/try/android-lollipop-arm-rel/properties.textpb
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
@@ -279,10 +279,6 @@ config_groups {
         name: "chromium/try/android-inverse-fieldtrials-pie-x86-fyi-rel"
         includable_only: true
       }
-      builders {
-        name: "chromium/try/android-lollipop-arm-rel"
-        includable_only: true
-      }
       builders {
         name: "chromium/try/android-marshmallow-arm64-rel"
         location_regexp: ".*"

diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -26987,90 +26987,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "android-lollipop-arm-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "jobs": 150,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "chromium.android",'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "android"'
-        '  ]'
-        '}'
-      execution_timeout_secs: 10800
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.chromium_tests.use_gitiles_trigger"
-        value: 100
-      }
-      experiments {
-        key: "chromium.chromium_tests.use_rdb_results"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "android-marshmallow-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"
@@ -49584,93 +49500,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "android-lollipop-arm-rel"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:android-lollipop-arm-rel"
-      dimensions: "cores:16"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04|Ubuntu-18.04"
-      dimensions: "pool:luci.chromium.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "jobs": 150,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "tryserver.chromium.android",'
-        '  "recipe": "chromium_trybot"'
-        '}'
-      execution_timeout_secs: 14400
-      expiration_secs: 7200
-      grace_period {
-        seconds: 120
-      }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      build_numbers: YES
-      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      task_template_canary_percentage {
-        value: 5
-      }
-      experiments {
-        key: "chromium.chromium_tests.use_rdb_results"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "try_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_try_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "android-marshmallow-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -1200,11 +1200,6 @@ consoles {
     category: "chromium.android|builder_tester|x86"
     short_name: "M"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
-    category: "chromium.android|depre"
-    short_name: "L"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
     category: "chromium.android|on_cq"
@@ -2392,9 +2387,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
@@ -3271,11 +3263,6 @@ consoles {
     category: "builder_tester|x86"
     short_name: "P"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
-    category: "depre"
-    short_name: "L"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
     category: "on_cq"
@@ -14297,9 +14284,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-inverse-fieldtrials-pie-x86-fyi-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
@@ -15387,9 +15371,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-inverse-fieldtrials-pie-x86-fyi-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/android-lollipop-arm-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
@@ -4702,16 +4702,6 @@ job {
     builder: "android-incremental-dbg"
   }
 }
-job {
-  id: "android-lollipop-arm-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "android-lollipop-arm-rel"
-  }
-}
 job {
   id: "android-marshmallow-arm64-rel"
   realm: "ci"
@@ -7461,7 +7451,6 @@ trigger {
   triggers: "android-cronet-x86-dbg"
   triggers: "android-cronet-x86-rel"
   triggers: "android-incremental-dbg"
-  triggers: "android-lollipop-arm-rel"
   triggers: "android-marshmallow-arm64-rel"
   triggers: "android-marshmallow-x86-rel"
   triggers: "android-marshmallow-x86-rel-non-cq"

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -918,20 +918,6 @@ ci.android_builder(
     ),
 )
 
-# TODO(crbug/1255748): Remove this once all try builds are finished
-ci.android_builder(
-    name = "android-lollipop-arm-rel",
-    branch_selector = branches.STANDARD_MILESTONE,
-    console_view_entry = consoles.console_view_entry(
-        category = "depre",
-        short_name = "L",
-    ),
-    cq_mirrors_console_view = "mirrors",
-    main_console_view = main_console_if_on_branch(),
-    tree_closing = False,
-    os = os.LINUX_BIONIC_REMOVE,
-)
-
 ci.android_builder(
     name = "android-marshmallow-arm64-rel",
     branch_selector = branches.STANDARD_MILESTONE,

diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
@@ -364,17 +364,6 @@ try_.chromium_android_builder(
     name = "android-inverse-fieldtrials-pie-x86-fyi-rel",
 )
 
-try_.chromium_android_builder(
-    name = "android-lollipop-arm-rel",
-    branch_selector = branches.STANDARD_MILESTONE,
-    builderless = not settings.is_main,
-    cores = 16 if settings.is_main else 8,
-    goma_jobs = goma.jobs.J150,
-    main_list_view = "try",
-    # TODO(crbug/1202741)
-    os = os.LINUX_XENIAL_OR_BIONIC_REMOVE,
-)
-
 try_.chromium_android_builder(
     name = "android-marshmallow-arm64-rel",
     branch_selector = branches.STANDARD_MILESTONE,