0

[Gardener] Revert "Fix blink web tests "--target" arg in wrapper scripts"

This reverts commit e247c324b8.

Reason for revert: build failure on deterministic Linux:
https://ci.chromium.org/ui/p/chromium/builders/ci/Deterministic%20Linux/50481
due to 6 files having a 2 byte size difference:
  bin/run_blink_web_tests
  bin/run_blink_wpt_tests
  bin/run_chrome_wpt_tests
  bin/run_devtools_web_tests
  bin/run_headless_shell_wpt
  bin/run_webgpu_blink_web_tests

Original change's description:
> Fix blink web tests "--target" arg in wrapper scripts
>
> The "name" arg to get_path_info() assumes the full filepath is a file
> and not a dir. Consequently, it chops off the trailing "." from any
> path. So when passing a build-dir path to it like
> "//out/some.build.dir", it will return "some.build" instead of
> "some.build.dir" that we want. This is the source of failures like:
> https://ci.chromium.org/ui/p/chromium/builders/try/mac12.0-blink-rel/7687/infra
>
> Using "file" though will behave how we want, ie: just giving us the
> last dir name of the build dir path. It's a little weird to passing
> "file" when we really want the dir name. But it seems to work.
>
> And roll the per-builder-build-dir experiment on blink trybots forward
> again. This effectively revert https://crrev.com/c/5983847 since it
> should be safe now with the GN fix.
>
> Led builds with this CL and the experiment restored:
> https://ci.chromium.org/b/8732452888242765697
> https://ci.chromium.org/b/8732452867352051937
>
> Bug: 355218109
> Change-Id: Ic884717cc5f0756128d20d15306ef08c9fbe8344
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5980565
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Ben Pastene <bpastene@chromium.org>
> Reviewed-by: Weizhong Xia <weizhong@google.com>
> Cr-Commit-Position: refs/heads/main@{#1377704}

Bug: 355218109
Change-Id: If944a1b2dc39dc6f18d70112e926bf139dee0185
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5989770
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: David Baron <dbaron@chromium.org>
Owners-Override: David Baron <dbaron@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1377843}
This commit is contained in:
David Baron
2024-11-04 20:29:07 +00:00
committed by Chromium LUCI CQ
parent 75c0e2549f
commit 3c620e0159
3 changed files with 52 additions and 19 deletions
BUILD.gn
infra/config
generated
subprojects

@ -1165,7 +1165,7 @@ if (use_blink && !is_cronet_build) {
]
} else {
base_out_dir = rebase_path(get_path_info(root_build_dir, "dir"), ".")
out_dir = get_path_info(root_build_dir, "file")
out_dir = get_path_info(root_build_dir, "name")
_common_web_test_options += [
"--build-directory",
base_out_dir,

@ -94848,7 +94848,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -101381,7 +101381,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -105655,7 +105655,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -106246,7 +106246,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -106344,7 +106344,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -106640,7 +106640,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -106738,7 +106738,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -106935,7 +106935,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -107131,7 +107131,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -107231,7 +107231,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -107534,7 +107534,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -107734,7 +107734,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -107834,7 +107834,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -107934,7 +107934,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -113934,7 +113934,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -114035,7 +114035,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -114235,7 +114235,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"
@ -114433,7 +114433,7 @@ buckets {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
value: 0
}
experiments {
key: "chromium_swarming.expose_merge_script_failures"

@ -41,6 +41,11 @@ def blink_mac_builder(*, name, **kwargs):
kwargs.setdefault("cores", None)
kwargs.setdefault("os", os.MAC_DEFAULT)
kwargs.setdefault("ssd", True)
# TODO(crbug.com/40232671): Remove when the experiment is the default.
kwargs.setdefault("experiments", {
"chromium.use_per_builder_build_dir_name": 0,
})
return try_.builder(
name = name,
**kwargs
@ -98,6 +103,10 @@ try_.builder(
},
),
os = os.LINUX_DEFAULT,
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
main_list_view = "try",
)
@ -115,6 +124,10 @@ try_.builder(
gn_args = "ci/linux-wpt-chromium-rel",
os = os.LINUX_DEFAULT,
contact_team_email = "chrome-blink-engprod@google.com",
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
main_list_view = "try",
)
@ -128,6 +141,10 @@ try_.builder(
builderless = True,
os = os.WINDOWS_10,
contact_team_email = "chrome-blink-engprod@google.com",
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
main_list_view = "try",
)
@ -191,6 +208,10 @@ try_.builder(
),
builderless = True,
os = os.WINDOWS_ANY,
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
)
try_.builder(
@ -253,6 +274,10 @@ try_.builder(
),
builderless = True,
os = os.WINDOWS_ANY,
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
)
try_.builder(
@ -312,6 +337,10 @@ try_.builder(
),
builderless = True,
os = os.WINDOWS_ANY,
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
)
blink_mac_builder(
@ -578,6 +607,10 @@ try_.builder(
os = os.MAC_ANY,
cpu = cpu.ARM64,
contact_team_email = "chrome-blink-engprod@google.com",
# TODO(crbug.com/40232671): Remove when the experiment is the default.
experiments = {
"chromium.use_per_builder_build_dir_name": 0,
},
main_list_view = "try",
)