[Lacros] modify fyi/try builder linux-lacros-tester-rel-reviver

Modify the builder. It runs browser_tests instead of lacros_chrome_browsertests. It ONLY runs disabled browser_tests. Bug: 1351472 Change-Id: Iad48feb732b23fec4b1abccd76b116ad1afecc5b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3859084 Reviewed-by: Ben Pastene <bpastene@chromium.org> Commit-Queue: Jieting Yang <yjt@google.com> Reviewed-by: Sven Zheng <svenzheng@chromium.org> Cr-Commit-Position: refs/heads/main@{#1041255}
blueboxd · Aug 30, 2022 · ec10a76 · ec10a76
1 parent 12eca66
commit ec10a76
Show file tree

Hide file tree

Showing 14 changed files with 104 additions and 62 deletions.
diff --git a/infra/config/generated/builders/ci/linux-lacros-tester-rel-reviver/properties.json b/infra/config/generated/builders/ci/linux-lacros-tester-rel-reviver/properties.json
@@ -38,10 +38,17 @@
           "builder": "linux-lacros-tester-rel-reviver",
           "project": "chromium"
         }
+      ],
+      "mirroring_builder_group_and_names": [
+        {
+          "builder": "linux-lacros-tester-rel-reviver",
+          "group": "tryserver.chromium.chromiumos"
+        }
       ]
     }
   },
   "$build/goma": {
+    "enable_ats": true,
     "rpc_extra_params": "?prod",
     "server_host": "goma.chromium.org",
     "use_luci_auth": true

diff --git a/infra/config/generated/builders/try/linux-lacros-tester-rel-reviver/properties.json b/infra/config/generated/builders/try/linux-lacros-tester-rel-reviver/properties.json
@@ -1,21 +1,59 @@
 {
+  "$build/chromium_tests_builder_config": {
+    "builder_config": {
+      "builder_db": {
+        "entries": [
+          {
+            "builder_id": {
+              "bucket": "ci",
+              "builder": "linux-lacros-tester-rel-reviver",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "build_gs_bucket": "chromium-chromiumos-archive",
+              "builder_group": "chromium.fyi",
+              "execution_mode": "COMPILE_AND_TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium",
+                "target_arch": "intel",
+                "target_bits": 64
+              },
+              "legacy_gclient_config": {
+                "apply_configs": [
+                  "chromeos"
+                ],
+                "config": "chromium_no_telemetry_dependencies"
+              }
+            }
+          }
+        ]
+      },
+      "builder_ids": [
+        {
+          "bucket": "ci",
+          "builder": "linux-lacros-tester-rel-reviver",
+          "project": "chromium"
+        }
+      ]
+    }
+  },
   "$build/goma": {
     "enable_ats": true,
     "rpc_extra_params": "?prod",
     "server_host": "goma.chromium.org",
     "use_luci_auth": true
   },
-  "$build/reclient": {
-    "instance": "rbe-chromium-untrusted",
-    "metrics_project": "chromium-reclient-metrics"
-  },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],
     "grouping_keys": [
       "status",
       "v.test_suite"
     ]
   },
-  "builder_group": "tryserver.chromium.linux",
+  "builder_group": "tryserver.chromium.chromiumos",
   "recipe": "chromium_trybot"
 }
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -37692,10 +37692,13 @@ buckets {
     builders {
       name: "linux-lacros-tester-rel-reviver"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builder:linux-lacros-tester-rel-reviver"
+      dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
+      dimensions: "free_space:standard"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
       exe {
         cipd_package: "infra/chromium/bootstrapper/${platform}"
         cipd_version: "latest"
@@ -70809,7 +70812,7 @@ buckets {
         '      }'
         '    }'
         '  },'
-        '  "builder_group": "tryserver.chromium.linux",'
+        '  "builder_group": "tryserver.chromium.chromiumos",'
         '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium_trybot"'
         '}'

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -2760,6 +2760,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-lacros-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-lacros-tester-rel-reviver"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-libfuzzer-asan-rel"
   }
@@ -17828,6 +17831,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-lacros-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/linux-lacros-tester-rel-reviver"
+  }
   builder_view_only: true
 }
 consoles {
@@ -18034,9 +18040,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-lacros-fyi-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux-lacros-tester-rel-reviver"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-lacros-version-skew-fyi"
   }

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
@@ -6203,7 +6203,7 @@ job {
 job {
   id: "linux-lacros-tester-rel-reviver"
   realm: "ci"
-  schedule: "0,30 1-15 * * *"
+  schedule: "0 3,5,7,9 * * *"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"

diff --git a/infra/config/subprojects/chromium/ci/chromium.fyi.star b/infra/config/subprojects/chromium/ci/chromium.fyi.star
@@ -494,8 +494,10 @@ ci.builder(
         category = "default",
         short_name = "rev",
     ),
-    # To avoid peak hours, we run it from 1 AM to 4 PM UTC.
-    schedule = "0,30 1-15 * * *",
+    os = os.LINUX_DEFAULT,
+    # To avoid peak hours, we run it from 8PM TO 4AM PST. It is
+    # 3 AM to 11 AM UTC.
+    schedule = "0 3,5,7,9 * * *",
 )
 
 ci.builder(

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
@@ -191,6 +191,15 @@ try_.builder(
     tryjob = try_.job(),
 )
 
+try_.builder(
+    name = "linux-lacros-tester-rel-reviver",
+    mirrors = [
+        "ci/linux-lacros-tester-rel-reviver",
+    ],
+    builderless = True,
+    main_list_view = "try",
+)
+
 try_.builder(
     name = "chromeos-kevin-compile-rel",
     mirrors = [

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
@@ -194,10 +194,6 @@ try_.builder(
     name = "linux-lacros-fyi-rel",
 )
 
-try_.builder(
-    name = "linux-lacros-tester-rel-reviver",
-)
-
 try_.builder(
     name = "linux-lacros-version-skew-fyi",
 )

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
@@ -103841,55 +103841,31 @@
     "additional_compile_targets": [
       "chrome",
       "chrome_sandbox",
-      "linux_symbols",
       "symupload"
     ],
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter",
-          "--gtest_also_run_disabled_tests"
-        ],
-        "isolate_profile_data": true,
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "name": "lacros_chrome_browsertests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-18.04"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "lacros_chrome_browsertests",
-        "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/"
-      },
-      {
-        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.filter",
-          "--gtest_also_run_disabled_tests"
+          "--gtest_also_run_disabled_tests",
+          "--gtest_filter=*DISABLE*"
         ],
         "isolate_profile_data": true,
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
-        "name": "lacros_chrome_browsertests_run_in_series",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "os": "Ubuntu-18.04"
             }
           ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 10
         },
-        "test": "lacros_chrome_browsertests_run_in_series",
-        "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/"
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
       }
     ]
   },

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
@@ -3883,6 +3883,14 @@
       },
     },
 
+    'linux_lacros_reviver_tests': {
+      'browser_tests': {
+        'swarming': {
+          'shards': 10,
+        },
+      },
+    },
+
     'linux_lacros_specific_gtests': {
       'lacros_chrome_unittests': {},
       'ozone_unittests': {},

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
@@ -3678,16 +3678,15 @@
         'mixins': [
           'isolate_profile_data',
           'linux-bionic',
-          'gtest_run_disabled',
+          'gtest_run_disabled_only',
         ],
         'additional_compile_targets': [
           'chrome',
           'chrome_sandbox',
-          'linux_symbols',
           'symupload'
         ],
         'test_suites': {
-          'gtest_tests': 'linux_lacros_chrome_browsertests_non_version_skew',
+          'gtest_tests': 'linux_lacros_reviver_tests',
         },
       },
       'linux-lacros-version-skew-fyi': {

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -1074,6 +1074,7 @@
       'linux-lacros-dbg': 'lacros_on_linux_debug_bot',
       'linux-lacros-rel': 'lacros_on_linux_release_trybot',
       'linux-lacros-rel-code-coverage': 'lacros_on_linux_release_trybot_coverage',
+      'linux-lacros-tester-rel-reviver': 'lacros_on_linux_release_trybot',
     },
 
     'tryserver.chromium.codesearch': {
@@ -1150,7 +1151,6 @@
       'linux-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_invert_fieldtrials',
       'linux-lacros-asan-lsan-rel': 'asan_lsan_lacros_release_bot_dcheck_always_on',
       'linux-lacros-fyi-rel': 'lacros_on_linux_release_trybot',
-      'linux-lacros-tester-rel-reviver': 'lacros_on_linux_release_bot',
       'linux-lacros-version-skew-fyi': 'lacros_on_linux_release_not_build_ash_bot',
       'linux-layout-tests-edit-ng': 'release_trybot',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',

diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json b/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
@@ -367,5 +367,17 @@
       "use_clang_coverage": true,
       "use_goma": true
     }
+  },
+  "linux-lacros-tester-rel-reviver": {
+    "gn_args": {
+      "also_build_ash_chrome": true,
+      "chromeos_is_browser_only": true,
+      "dcheck_always_on": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 0,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
   }
 }
diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.linux.json b/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
@@ -389,17 +389,6 @@
       "use_goma": true
     }
   },
-  "linux-lacros-tester-rel-reviver": {
-    "gn_args": {
-      "also_build_ash_chrome": true,
-      "chromeos_is_browser_only": true,
-      "dcheck_always_on": false,
-      "is_component_build": false,
-      "is_debug": false,
-      "target_os": "chromeos",
-      "use_goma": true
-    }
-  },
   "linux-lacros-version-skew-fyi": {
     "gn_args": {
       "chromeos_is_browser_only": true,