[updater] add win builders to build for 32 bit target cpu.
Also, adds win7 32-bit testers to test these builds.
Bug: 1151458
Change-Id: Iaacac3d1e0ecf4336cf0c9f29cb2be12973ee109
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552944
Commit-Queue: Anjali Doneria <adoneria@google.com>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830783}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 65d4c767..fba7cdf 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -20849,7 +20849,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
- dimensions: "cpu:x86"
+ dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -20896,7 +20896,7 @@
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
- dimensions: "cpu:x86"
+ dimensions: "cpu:x86-64"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -21357,6 +21357,194 @@
}
}
builders {
+ name: "win32-updater-builder-dbg"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Windows-10"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ value: 100
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
+ name: "win32-updater-builder-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Windows-10"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ value: 100
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
+ name: "win7(32)-updater-tester-dbg"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-16.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/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ value: 100
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
+ name: "win7(32)-updater-tester-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-16.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/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.updater\",\"recipe\":\"chromium\"}"
+ execution_timeout_secs: 10800
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ value: 100
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
name: "win7-updater-tester-dbg"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index d12720bb..1aed1ab5 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -9354,18 +9354,28 @@
short_name: "bld"
}
builders {
+ name: "buildbucket/luci.chromium.ci/win7(32)-updater-tester-dbg"
+ category: "debug|win (32)"
+ short_name: "7"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/win32-updater-builder-dbg"
+ category: "debug|win (32)"
+ short_name: "bld"
+ }
+ builders {
name: "buildbucket/luci.chromium.ci/win10-updater-tester-dbg"
- category: "debug|win"
+ category: "debug|win (64)"
short_name: "10"
}
builders {
name: "buildbucket/luci.chromium.ci/win7-updater-tester-dbg"
- category: "debug|win"
+ category: "debug|win (64)"
short_name: "7"
}
builders {
name: "buildbucket/luci.chromium.ci/win-updater-builder-dbg"
- category: "debug|win"
+ category: "debug|win (64)"
short_name: "bld"
}
builders {
@@ -9409,18 +9419,28 @@
short_name: "bld"
}
builders {
+ name: "buildbucket/luci.chromium.ci/win7(32)-updater-tester-rel"
+ category: "release|win (32)"
+ short_name: "7"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/win32-updater-builder-rel"
+ category: "release|win (32)"
+ short_name: "bld"
+ }
+ builders {
name: "buildbucket/luci.chromium.ci/win10-updater-tester-rel"
- category: "release|win"
+ category: "release|win (64)"
short_name: "10"
}
builders {
name: "buildbucket/luci.chromium.ci/win7-updater-tester-rel"
- category: "release|win"
+ category: "release|win (64)"
short_name: "7"
}
builders {
name: "buildbucket/luci.chromium.ci/win-updater-builder-rel"
- category: "release|win"
+ category: "release|win (64)"
short_name: "bld"
}
header {
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 40d4a9e..db73ef4 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -6321,6 +6321,54 @@
}
}
job {
+ id: "win32-updater-builder-dbg"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "win32-updater-builder-dbg"
+ }
+}
+job {
+ id: "win32-updater-builder-rel"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "win32-updater-builder-rel"
+ }
+}
+job {
+ id: "win7(32)-updater-tester-dbg"
+ realm: "ci"
+ acls {
+ role: TRIGGERER
+ granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ }
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "win7(32)-updater-tester-dbg"
+ }
+}
+job {
+ id: "win7(32)-updater-tester-rel"
+ realm: "ci"
+ acls {
+ role: TRIGGERER
+ granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ }
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "win7(32)-updater-tester-rel"
+ }
+}
+job {
id: "win7-updater-tester-dbg"
realm: "ci"
acls {
@@ -6655,6 +6703,8 @@
triggers: "win32-archive-rel"
triggers: "win32-arm64-rel"
triggers: "win32-official"
+ triggers: "win32-updater-builder-dbg"
+ triggers: "win32-updater-builder-rel"
triggers: "Chromium Android ARM 32-bit Goma RBE Staging"
triggers: "Chromium Android ARM 32-bit Goma RBE ToT"
triggers: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index 1f47eb2..a5aa22a 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -2730,47 +2730,83 @@
ci.updater_builder(
name = "win-updater-builder-dbg",
console_view_entry = ci.console_view_entry(
- category = "debug|win",
+ category = "debug|win (64)",
short_name = "bld",
),
os = os.WINDOWS_DEFAULT,
- cpu = cpu.X86,
+ builderless = True,
+)
+
+ci.updater_builder(
+ name = "win32-updater-builder-dbg",
+ console_view_entry = ci.console_view_entry(
+ category = "debug|win (32)",
+ short_name = "bld",
+ ),
+ os = os.WINDOWS_DEFAULT,
builderless = True,
)
ci.updater_builder(
name = "win-updater-builder-rel",
console_view_entry = ci.console_view_entry(
- category = "release|win",
+ category = "release|win (64)",
short_name = "bld",
),
os = os.WINDOWS_DEFAULT,
- cpu = cpu.X86,
+ builderless = True,
+)
+
+ci.updater_builder(
+ name = "win32-updater-builder-rel",
+ console_view_entry = ci.console_view_entry(
+ category = "release|win (32)",
+ short_name = "bld",
+ ),
+ os = os.WINDOWS_DEFAULT,
builderless = True,
)
ci.updater_builder(
name = "win7-updater-tester-dbg",
console_view_entry = ci.console_view_entry(
- category = "debug|win",
+ category = "debug|win (64)",
short_name = "7",
),
triggered_by = ["win-updater-builder-dbg"],
)
ci.updater_builder(
+ name = "win7(32)-updater-tester-dbg",
+ console_view_entry = ci.console_view_entry(
+ category = "debug|win (32)",
+ short_name = "7",
+ ),
+ triggered_by = ["win32-updater-builder-dbg"],
+)
+
+ci.updater_builder(
name = "win7-updater-tester-rel",
console_view_entry = ci.console_view_entry(
- category = "release|win",
+ category = "release|win (64)",
short_name = "7",
),
triggered_by = ["win-updater-builder-rel"],
)
ci.updater_builder(
+ name = "win7(32)-updater-tester-rel",
+ console_view_entry = ci.console_view_entry(
+ category = "release|win (32)",
+ short_name = "7",
+ ),
+ triggered_by = ["win32-updater-builder-rel"],
+)
+
+ci.updater_builder(
name = "win10-updater-tester-dbg",
console_view_entry = ci.console_view_entry(
- category = "debug|win",
+ category = "debug|win (64)",
short_name = "10",
),
triggered_by = ["win-updater-builder-dbg"],
@@ -2779,7 +2815,7 @@
ci.updater_builder(
name = "win10-updater-tester-rel",
console_view_entry = ci.console_view_entry(
- category = "release|win",
+ category = "release|win (64)",
short_name = "10",
),
triggered_by = ["win-updater-builder-rel"],
diff --git a/testing/buildbot/chromium.updater.json b/testing/buildbot/chromium.updater.json
index cfe90c462..c3b94db 100644
--- a/testing/buildbot/chromium.updater.json
+++ b/testing/buildbot/chromium.updater.json
@@ -425,6 +425,96 @@
}
]
},
+ "win7(32)-updater-tester-dbg": {
+ "gtest_tests": [
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-32",
+ "integrity": "high",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "updater_tests",
+ "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+ }
+ ],
+ "isolated_scripts": [
+ {
+ "isolate_name": "updater_integration_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "updater_integration_tests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-32",
+ "integrity": "high",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+ }
+ ]
+ },
+ "win7(32)-updater-tester-rel": {
+ "gtest_tests": [
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-32",
+ "integrity": "high",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "updater_tests",
+ "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+ }
+ ],
+ "isolated_scripts": [
+ {
+ "isolate_name": "updater_integration_tests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "updater_integration_tests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-32",
+ "integrity": "high",
+ "os": "Windows-7-SP1"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test_id_prefix": "ninja://chrome/updater:updater_integration_tests/"
+ }
+ ]
+ },
"win7-updater-tester-dbg": {
"gtest_tests": [
{
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 63cd9dd..64e8ec82 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -5367,6 +5367,40 @@
]
},
},
+ 'win7(32)-updater-tester-dbg': {
+ 'mixins': [
+ 'win7',
+ 'x86-32'
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'updater_gtests',
+ 'isolated_scripts': 'updater_isolated_scripts',
+ },
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'integrity': 'high',
+ }
+ ]
+ },
+ },
+ 'win7(32)-updater-tester-rel': {
+ 'mixins': [
+ 'win7',
+ 'x86-32'
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'updater_gtests',
+ 'isolated_scripts': 'updater_isolated_scripts',
+ },
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'integrity': 'high',
+ }
+ ]
+ },
+ },
'win7-updater-tester-dbg': {
'mixins': [
'win7',
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index be53a6fa..7da0c81 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -657,6 +657,8 @@
'mac-updater-builder-rel': 'updater_release_bot',
'win-updater-builder-dbg': 'updater_debug_bot',
'win-updater-builder-rel': 'updater_release_bot',
+ 'win32-updater-builder-dbg': 'updater_debug_bot_x86',
+ 'win32-updater-builder-rel': 'updater_release_bot_x86',
},
# TODO(crbug.com/818301): This master is going away.
@@ -2332,10 +2334,18 @@
'updater_on_win_mac', 'debug_bot',
],
+ 'updater_debug_bot_x86': [
+ 'updater_on_win_mac', 'debug_bot', 'x86',
+ ],
+
'updater_release_bot': [
'updater_on_win_mac', 'release_bot',
],
+ 'updater_release_bot_x86': [
+ 'updater_on_win_mac', 'release_bot', 'x86',
+ ],
+
'updater_release_trybot': [
'updater_on_win_mac', 'release_trybot',
],
diff --git a/tools/mb/mb_config_expectations/chromium.updater.json b/tools/mb/mb_config_expectations/chromium.updater.json
index 37e0053..2b7c3fa 100644
--- a/tools/mb/mb_config_expectations/chromium.updater.json
+++ b/tools/mb/mb_config_expectations/chromium.updater.json
@@ -32,5 +32,24 @@
"is_google_branded": true,
"use_goma": true
}
+ },
+ "win32-updater-builder-dbg": {
+ "gn_args": {
+ "is_component_build": true,
+ "is_debug": true,
+ "is_google_branded": true,
+ "symbol_level": 1,
+ "target_cpu": "x86",
+ "use_goma": true
+ }
+ },
+ "win32-updater-builder-rel": {
+ "gn_args": {
+ "is_component_build": false,
+ "is_debug": false,
+ "is_google_branded": true,
+ "target_cpu": "x86",
+ "use_goma": true
+ }
}
}
\ No newline at end of file