Fix feature enabling on linux-oi-rel

When the bot was initially configured, "--enable-feature" was
incorrectly used when it should have been "--enable-features". This CL
fixes that. Since it's possible the bot won't stay green with this
change, temporarily disable its ability to close the tree.

Bug: 40259221
Change-Id: Ida766b469d92a624bdc53610f16f504bac2bbe37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6347936
Commit-Queue: James Maclean <wjmaclean@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431720}

infra/config/generated/builders/ci/Linux Builder/targets/chromium.linux.json

@@ -2140,7 +2140,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2158,7 +2158,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2176,7 +2176,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2193,7 +2193,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2214,7 +2214,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -2242,7 +2242,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -2269,7 +2269,7 @@
       {
         "args": [
           "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [

infra/config/generated/builders/ci/linux-oi-rel/properties.json

@@ -106,11 +106,5 @@
     ]
   },
   "builder_group": "chromium.linux",
-  "gardener_rotations": [
-    "chromium"
-  ],
-  "recipe": "chromium",
-  "sheriff_rotations": [
-    "chromium"
-  ]
+  "recipe": "chromium"
 }

infra/config/generated/builders/ci/linux-oi-rel/targets/chromium.linux.json

@@ -3,7 +3,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -21,7 +21,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -39,7 +39,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -56,7 +56,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -77,7 +77,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -105,7 +105,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -132,7 +132,7 @@
       {
         "args": [
           "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [

infra/config/generated/builders/try/linux-oi-rel/targets/chromium.linux.json

@@ -34,7 +34,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -52,7 +52,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -70,7 +70,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -87,7 +87,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -108,7 +108,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -136,7 +136,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -163,7 +163,7 @@
       {
         "args": [
           "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [

infra/config/generated/builders/try/linux_chromium_compile_rel_ng/targets/chromium.linux.json

@@ -2140,7 +2140,7 @@
     "gtest_tests": [
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2158,7 +2158,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2176,7 +2176,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2193,7 +2193,7 @@
       },
       {
         "args": [
-          "--enable-feature=OriginKeyedProcessesByDefault"
+          "--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -2214,7 +2214,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -2242,7 +2242,7 @@
         "args": [
           "--num-retries=3",
           "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [
@@ -2269,7 +2269,7 @@
       {
         "args": [
           "--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
-          "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault"
+          "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault"
         ],
         "merge": {
           "args": [

infra/config/generated/cq-usage/mega_cq_bots.txt

@@ -115,7 +115,6 @@ chromium/try/linux-gcc-rel
 chromium/try/linux-libfuzzer-asan-rel
 chromium/try/linux-msan-chained-origins-rel
 chromium/try/linux-msan-no-origins-rel
-chromium/try/linux-oi-rel
 chromium/try/linux-rel
 chromium/try/linux-rel-test-selection
 chromium/try/linux-tsan-dbg

infra/config/generated/luci/cr-buildbucket.cfg

@@ -58412,14 +58412,8 @@ buckets {
         '    }'
         '  },'
         '  "builder_group": "chromium.linux",'
-        '  "gardener_rotations": ['
-        '    "chromium"'
-        '  ],'
         '  "led_builder_is_bootstrapped": true,'
-        '  "recipe": "chromium",'
-        '  "sheriff_rotations": ['
-        '    "chromium"'
-        '  ]'
+        '  "recipe": "chromium"'
         '}'
       execution_timeout_secs: 10800
       build_numbers: YES

infra/config/generated/luci/luci-milo.cfg

@@ -6539,11 +6539,6 @@ consoles {
     category: "chromium.fuzz|win asan"
     short_name: "rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-oi-rel"
-    category: "chromium.linux|OriginIsolation"
-    short_name: "oi"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-bfcache-rel"
     category: "chromium.linux|bfcache"
@@ -7335,11 +7330,6 @@ consoles {
     category: "chromium.fuchsia|det"
     short_name: "x64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-oi-rel"
-    category: "chromium.linux|OriginIsolation"
-    short_name: "oi"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-bfcache-rel"
     category: "chromium.linux|bfcache"

infra/config/generated/luci/luci-notify.cfg

@@ -3719,14 +3719,6 @@ notifiers {
   }
 }
 notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
-    email {
-      rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
-    }
-    template: "tree_closure_email_template"
-  }
   notifications {
     on_occurrence: FAILURE
     failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
@@ -3738,10 +3730,6 @@ notifiers {
     bucket: "ci"
     name: "linux-oi-rel"
   }
-  tree_closers {
-    tree_status_host: "chromium-status.appspot.com"
-    failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|generate_build_files|runhooks|update|\\w*nocompile_test)\\b"
-  }
 }
 notifiers {
   notifications {

infra/config/generated/sheriff-rotations/chromium.txt

@@ -103,7 +103,6 @@ ci/linux-chromeos-dbg
 ci/linux-chromeos-rel
 ci/linux-extended-tracing-rel
 ci/linux-gcc-rel
-ci/linux-oi-rel
 ci/linux-presubmit
 ci/linux-v4l2-codec-rel
 ci/linux-win-cross-rel

infra/config/subprojects/chromium/ci/chromium.linux.star

@@ -823,7 +823,7 @@ ci.builder(
         per_test_modifications = {
             "browser_tests": targets.mixin(
                 args = [
-                    "--enable-feature=OriginKeyedProcessesByDefault",
+                    "--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 swarming = targets.swarming(
                     shards = 33,
@@ -831,13 +831,13 @@ ci.builder(
             ),
             "unit_tests": targets.mixin(
                 args = [
-                    "--enable-feature=OriginKeyedProcessesByDefault",
+                    "--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 # Default shards = 1 should be ok here.
             ),
             "content_browsertests": targets.mixin(
                 args = [
-                    "--enable-feature=OriginKeyedProcessesByDefault",
+                    "--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 swarming = targets.swarming(
                     shards = 8,
@@ -845,13 +845,13 @@ ci.builder(
             ),
             "content_unittests": targets.mixin(
                 args = [
-                    "--enable-feature=OriginKeyedProcessesByDefault",
+                    "--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 # Default shards = 1 should be ok here.
             ),
             "blink_web_tests": targets.mixin(
                 args = [
-                    "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault",
+                    "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 swarming = targets.swarming(
                     shards = 9,
@@ -859,7 +859,7 @@ ci.builder(
             ),
             "blink_wpt_tests": targets.mixin(
                 args = [
-                    "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault",
+                    "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 swarming = targets.swarming(
                     shards = 2,
@@ -867,12 +867,15 @@ ci.builder(
             ),
             "chrome_wpt_tests": targets.mixin(
                 args = [
-                    "--additional-driver-flag=--enable-feature=OriginKeyedProcessesByDefault",
+                    "--additional-driver-flag=--enable-features=OriginKeyedProcessesByDefault",
                 ],
                 # Default shards = 1 should be ok here.
             ),
         },
     ),
+    # Remove the following two lines once the bot is running and green.
+    gardener_rotations = args.ignore_default(None),
+    tree_closing = False,
     console_view_entry = consoles.console_view_entry(
         category = "OriginIsolation",
         short_name = "oi",