chromium/src
0
Fork 0
Code Activity

Remove deprecated git DEPS entry for chromium-variations

Browse Source 
This CL removes the git submodule dependency for
`//third_party/chromium-variations`, which has been replaced by a CIPD
dependency rooted at `//chrome/test/data/variations/cipd`.

This drops a ~8GB git dep from every chromium checkout (i.e. all dev machines and all bots).

NOTE TO GARDENERS: if this CL breaks some non-try buildbot, it is almost
certainly a latent path that needs to be updated as mentioned above. It
is preferable to fix the path versus reverting this CL, which would
cause a (time and bandwidth consuming) re-download of the git dep.

Bug: 371615508
Change-Id: I1b9acff9b755167fc31bdd827fc5ed79b8eb6f8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6340949
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Roger McFarlane <rogerm@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1431212}
This commit is contained in:
Roger McFarlane
2025-03-11 16:01:02 -07:00
committed by Chromium LUCI CQ
parent c7d94d025e
commit f554b2dc7d
14 changed files with 36 additions and 45 deletions
.gitmodulesDEPSOWNERS
android_webview
test
BUILD.gn
tools
automated_ui_tests
BUILD.gn
run_cts.py
system_webview_shell
BUILD.gn
chrome/test/variations
README.md
components/variations/test_data
.gitignore
infra/config
generated
builders
ci
android-fieldtrial-rel
targets
chromium.fyi.json
try
android-fieldtrial-rel
targets
chromium.fyi.json
targets
variants.star
third_party
chromium-variations
tools/licenses
licenses.py

3
.gitmodules vendored

@ -173,9 +173,6 @@
[submodule "third_party/ced/src"]
path = third_party/ced/src
url = https://chromium.googlesource.com/external/github.com/google/compact_enc_det
[submodule "third_party/chromium-variations"]
path = third_party/chromium-variations
url = https://chromium.googlesource.com/chromium-variations
[submodule "third_party/chromevox/third_party/sre/src"]
path = third_party/chromevox/third_party/sre/src
url = https://chromium.googlesource.com/external/github.com/zorkow/speech-rule-engine

9
DEPS

@ -365,10 +365,6 @@ vars = {
# and whatever else without interference from each other.
'catapult_revision': '4d2793429fbccd6cbddc46b4b3ca9474e72c528a',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling chromium_variations
# and whatever else without interference from each other.
'chromium_variations_revision': '270a25f8795caf0a798ebf5a7d69284e3d830d19',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling CrossBench
# and whatever else without interference from each other.
'crossbench_revision': 'a4825d77765470c6df91f6c5315407939f4741a0',
@ -1470,7 +1466,7 @@ deps = {
'dep_type': 'cipd',
},
'src/chrome/test/data/variations/cipd': {
'src/components/variations/test_data/cipd': {
'packages': [
{
'package': 'chromium/chrome/test/data/variations/cipd',
@ -1938,9 +1934,6 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/chromium-variations':
Var('chromium_git') + '/chromium-variations.git' + '@' + Var('chromium_variations_revision'),
# Dependency for ChromeVox.
'src/third_party/chromevox/third_party/sre/src': {
'url': Var('chromium_git') + '/external/github.com/zorkow/speech-rule-engine.git' + '@' + '5a56d4d33d67dc7c692da032d2ebbdefd7de780e',

1
OWNERS

@ -91,7 +91,6 @@ per-file third_party/catapult=*
per-file third_party/ced/src=*
per-file third_party/chromevox/third_party/sre/src=*
per-file third_party/chromite=*
per-file third_party/chromium-variations=*
per-file third_party/clang-format/script=*
per-file third_party/cld_3/src=*
per-file third_party/colorama/src=*

8
android_webview/test/BUILD.gn

@ -57,7 +57,7 @@ if (android_64bit_target_cpu) {
data_deps = [ "//build/android:test_runner_py" ]
data = [
"//android_webview/tools/cts_config/",
"//third_party/chromium-variations",
"//components/variations/test_data/cipd",
]
}
@ -67,7 +67,7 @@ if (android_64bit_target_cpu) {
data_deps = [ "//build/android:test_runner_py" ]
data = [
"//android_webview/tools/cts_config/",
"//third_party/chromium-variations",
"//components/variations/test_data/cipd",
]
}
@ -78,7 +78,7 @@ if (android_64bit_target_cpu) {
data_deps = [ "//build/android:test_runner_py" ]
data = [
"//android_webview/tools/cts_config/",
"//third_party/chromium-variations",
"//components/variations/test_data/cipd",
]
}
}
@ -577,7 +577,7 @@ base_webview_instrumentation_test_apk("webview_instrumentation_test_apk") {
"//third_party/blink/web_tests/resources/global-interface-listing.js",
"//third_party/blink/web_tests/webexposed/global-interface-listing.html",
"//third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt",
"//third_party/chromium-variations/",
"//components/variations/test_data/cipd/",
"$root_build_dir/third_party/blink/web_tests/resources/js-test.js",
]
data_deps =

2
android_webview/tools/automated_ui_tests/BUILD.gn

@ -42,7 +42,7 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") {
"//ui/android:ui_java_test_support",
]
data = [
"//third_party/chromium-variations",
"//components/variations/test_data/cipd",
"test/data/",
]

2
android_webview/tools/run_cts.py

@ -566,7 +566,7 @@ def main():
'Defaults to: ' + _DEFAULT_TRADEFED_ADB_PATH)
# The variations test seed file should be in JSON format. Please look
# in //third_party/chromium-variations for examples of variations
# in //components/variations/test_data/cipd for examples of variations
# test seeds.
parser.add_argument('--variations-test-seed-path',
type=os.path.relpath,

2
android_webview/tools/system_webview_shell/BUILD.gn

@ -162,7 +162,7 @@ instrumentation_test_apk("system_webview_shell_layout_test_apk") {
]
data = [
"test/data/",
"//third_party/chromium-variations",
"//components/variations/test_data/cipd",
]
# Tell GN to ignore 'incremental_install' even if the user has it in their GN

7
chrome/test/variations/README.md

@ -6,8 +6,11 @@ works with Chrome on different platforms and channels.
There are generally two ways to trigger tests here:
1) CI/CQ runs: this currently uses committed seeds under test/data/variations;
the test can switch to the latest daily built seeds once they are available
here in this repo: https://chromium.googlesource.com/chromium-variations
the test can switch to the latest daily built seeds in this repo:
https://chrome-infra-packages.appspot.com/p/chromium/chrome/test/data/variations/cipd
Which is brought into //components/variations/test_data/cipd via DEPS.
2) Server seed changes: the seed changes will trigger a swarming test to
execute tests using the seed with seed changes; this setup is to ensure any

0
chrome/test/data/variations/.gitignore → components/variations/test_data/.gitignore vendored

16
infra/config/generated/builders/ci/android-fieldtrial-rel/targets/chromium.fyi.json

@ -95,7 +95,7 @@
},
{
"args": [
"--webview-variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
@ -144,7 +144,7 @@
},
{
"args": [
"--webview-variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
@ -242,7 +242,7 @@
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -293,7 +293,7 @@
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -401,7 +401,7 @@
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -460,7 +460,7 @@
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -563,7 +563,7 @@
},
{
"args": [
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -612,7 +612,7 @@
},
{
"args": [
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",

16
infra/config/generated/builders/try/android-fieldtrial-rel/targets/chromium.fyi.json

@ -95,7 +95,7 @@
},
{
"args": [
"--webview-variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
@ -144,7 +144,7 @@
},
{
"args": [
"--webview-variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
@ -242,7 +242,7 @@
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -293,7 +293,7 @@
{
"args": [
"--use-apk-under-test-flags-file",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -401,7 +401,7 @@
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -460,7 +460,7 @@
"args": [
"--store-data-dependencies-in-temp",
"--store-tombstones",
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -563,7 +563,7 @@
},
{
"args": [
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -612,7 +612,7 @@
},
{
"args": [
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",

8
infra/config/targets/variants.star

@ -135,7 +135,7 @@ targets.variant(
identifier = "Single Group Per Study Prefer Existing Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -148,7 +148,7 @@ targets.variant(
identifier = "Single Group Per Study Prefer New Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--accept-empty-variations-seed-signature",
"--webview-verbose-logging",
"--disable-field-trial-config",
@ -161,7 +161,7 @@ targets.variant(
identifier = "Single Group Per Study Prefer Existing Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--webview-variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_existing_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",
@ -174,7 +174,7 @@ targets.variant(
identifier = "Single Group Per Study Prefer New Behavior Field Trial Config",
generate_pyl_entry = False,
args = [
"--webview-variations-test-seed-path=../../chrome/test/data/variations/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-variations-test-seed-path=../../components/variations/test_data/cipd/single_group_per_study_prefer_new_behavior/seed.json",
"--webview-command-line-arg=--accept-empty-variations-seed-signature",
"--webview-command-line-arg=--webview-verbose-logging",
"--webview-command-line-arg=--disable-field-trial-config",

1
third_party/chromium-variations vendored

Submodule third_party/chromium-variations deleted from 270a25f879

6
tools/licenses/licenses.py

@ -62,9 +62,9 @@ PRUNE_PATHS = set([
# Only binaries, used during development.
os.path.join('third_party', 'valgrind'),
# Not actually a third party dependency. Supplies configuration for
# enabling or disabling field trials and features in Chromium projects.
os.path.join('third_party', 'chromium-variations'),
# Supplies configuration setting for enabling or disabling field trials and
# features in Chromium projects.
os.path.join('components', 'variations', 'test_data', 'cipd'),
# Used for development and test, not in the shipping product.
os.path.join('build', 'secondary'),