Revert "Roll reclient, buildtools; update related DEPS to match Chromium"
This reverts commit 2110deada3fe7fef7a1855c0fa30d9ddd8b9de6a.
Reason for revert: Still causing a bunch of mac flakes. Seems to be an issue with running reclient on mac11; may try using siso's own remoteexec instead of reclient.
Original change's description:
> Roll reclient, buildtools; update related DEPS to match Chromium
>
> This reverts commit c875dc549dc48b2a560b574d15035fe0af0ad00f
> and adds speculative fixes. The issue seemed to be related to
> buildtools, so roll buildtools to version from chromium 'main', and also
> update download_and_configure_reclient_cfgs to match Chromium 'main', at
> the same version I took the reclient release number from.
>
> Original change's description:
> > Revert "Roll reclient"
> >
> > This reverts commit 69e7f7ea83a600146b1be9863aad564f5cb09feb.
> >
> > Reason for revert: Broke ci/mac-rel:
> > https://ci.chromium.org/ui/p/dawn/builders/ci/mac-rel/b8724371667366757009/overview
> >
> > Original change's description:
> > > Roll reclient
> > >
> > > Fixes error "Failed to determine auth mechanism: couldn't determine auth
> > > mechanism from flags map[credential_file:false service_no_auth:false
> > > use_application_default_credentials:false use_external_auth_token:true
> > > use_gce_credentials:false use_gcloud_creds:false
> > > use_google_prod_creds:false]"
> > >
> > > Bug: none
> > > Change-Id: I4143711752705987c84cd6b29961b6880fb0366d
> > > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/223854
> > > Reviewed-by: Ryan Harrison <rharrison@chromium.org>
> > > Auto-Submit: Kai Ninomiya <kainino@chromium.org>
> > > Commit-Queue: Ryan Harrison <rharrison@chromium.org>
> > > Commit-Queue: Kai Ninomiya <kainino@chromium.org>
> >
> > TBR=kainino@chromium.org,rharrison@chromium.org,dawn-scoped@luci-project-accounts.iam.gserviceaccount.com
> >
> > Change-Id: Ia25eb2bb5d11401e14a90466bd40e78da33feea3
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: none
> > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/223858
> > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
> > Commit-Queue: Kai Ninomiya <kainino@chromium.org>
>
> Bug: none
> Change-Id: I70a53b943ca8f4566adc2fb789542c9d35c16caf
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/223859
> Auto-Submit: Kai Ninomiya <kainino@chromium.org>
> Commit-Queue: Loko Kung <lokokung@google.com>
> Reviewed-by: Loko Kung <lokokung@google.com>
Bug: none
No-Try: true
Change-Id: I1a18c572e46f6a21c46bd46a0ac0890998b484d4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/223898
Auto-Submit: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/DEPS b/DEPS
index 3641a6f..578c039 100644
--- a/DEPS
+++ b/DEPS
@@ -53,7 +53,7 @@
# reclient CIPD package
'reclient_package': 'infra/rbe/client/',
# reclient CIPD package version
- 'reclient_version': 're_client_version:0.175.0.98046de5-gomaip',
+ 'reclient_version': 're_client_version:0.143.0.518e369-gomaip',
# 'magic' text to tell depot_tools that git submodules should be accepted
# but parity with DEPS file is expected.
@@ -70,7 +70,7 @@
deps = {
'buildtools': {
- 'url': '{chromium_git}/chromium/src/buildtools@6b4eaa1ed0f3a604f354b4098e4f676f7815f1da',
+ 'url': '{chromium_git}/chromium/src/buildtools@a660247d3c14a172b74b8e832ba1066b30183c97',
'condition': 'dawn_standalone',
},
'third_party/clang-format/script': {
@@ -415,8 +415,8 @@
'version': Var('reclient_version'),
}
],
- 'condition': 'dawn_standalone and (host_cpu != "arm64" or host_os == "mac") and non_git_source',
'dep_type': 'cipd',
+ 'condition': 'dawn_standalone',
},
# Misc dependencies inherited from Tint
@@ -663,54 +663,22 @@
'-o', 'third_party/node/node.exe',
],
},
- # Configure remote exec cfg files
- {
- # Use luci_auth if on windows and using chrome-untrusted project
- 'name': 'download_and_configure_reclient_cfgs',
- 'pattern': '.',
- 'condition': 'dawn_standalone and download_remoteexec_cfg and host_os == "win"',
- 'action': ['python3',
- 'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
- '--rbe_instance',
- Var('rbe_instance'),
- '--reproxy_cfg_template',
- 'reproxy.cfg.template',
- '--rewrapper_cfg_project',
- Var('rewrapper_cfg_project'),
- '--use_luci_auth_credshelper',
- '--quiet',
- ],
- }, {
- 'name': 'download_and_configure_reclient_cfgs',
- 'pattern': '.',
- 'condition': 'dawn_standalone and download_remoteexec_cfg and not host_os == "win"',
- 'action': ['python3',
- 'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
- '--rbe_instance',
- Var('rbe_instance'),
- '--reproxy_cfg_template',
- 'reproxy.cfg.template',
- '--rewrapper_cfg_project',
- Var('rewrapper_cfg_project'),
- '--quiet',
- ],
- },
- {
- 'name': 'configure_reclient_cfgs',
- 'pattern': '.',
- 'condition': 'dawn_standalone and not download_remoteexec_cfg',
- 'action': ['python3',
- 'buildtools/reclient_cfgs/configure_reclient_cfgs.py',
- '--rbe_instance',
- Var('rbe_instance'),
- '--reproxy_cfg_template',
- 'reproxy.cfg.template',
- '--rewrapper_cfg_project',
- Var('rewrapper_cfg_project'),
- '--skip_remoteexec_cfg_fetch',
- '--quiet',
- ],
- },
+ {
+ # Download remote exec cfg files
+ 'name': 'fetch_reclient_cfgs',
+ 'pattern': '.',
+ 'condition': 'download_remoteexec_cfg and dawn_standalone',
+ 'action': ['python3',
+ 'buildtools/reclient_cfgs/fetch_reclient_cfgs.py',
+ '--rbe_instance',
+ Var('rbe_instance'),
+ '--reproxy_cfg_template',
+ 'reproxy.cfg.template',
+ '--rewrapper_cfg_project',
+ Var('rewrapper_cfg_project'),
+ '--quiet',
+ ],
+ },
]
recursedeps = [
diff --git a/buildtools b/buildtools
index 6b4eaa1..a660247 160000
--- a/buildtools
+++ b/buildtools
@@ -1 +1 @@
-Subproject commit 6b4eaa1ed0f3a604f354b4098e4f676f7815f1da
+Subproject commit a660247d3c14a172b74b8e832ba1066b30183c97
