commit ce158be9a03dcb08b0fbcd3b60b2dff67dde3338
author Ryan Harrison <rharrison@chromium.org> Thu Jul 20 17:06:56 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jul 20 17:06:56 2023 +0000
tree d8a910b82cc568a90b6bd93120bf56842f68f3f6
parent 7be7549d944e0603d04dece430a0756ec297333f

Remove SISO and enable downloading reclient configs

Change-Id: I7c633704f42066f38a4da6c907b2b220dfb7a258
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/142300
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index 30af1a2..3e16151 100644
--- a/DEPS
+++ b/DEPS
@@ -44,11 +44,6 @@
   'reclient_package': 'infra/rbe/client/',
   # reclient CIPD package version
   'reclient_version': 're_client_version:0.108.0.7cdbbe9-gomaip',
-
-  # Fetch siso CIPD package
-  'checkout_siso': False,
-  # siso CIPD package version.
-  'siso_version': 'git_revision:06bae0e9d7265e972358b23f77d9867930061db0',
 }
 
 deps = {
@@ -244,16 +239,6 @@
     'dep_type': 'cipd',
     'condition': 'dawn_standalone',
   },
-  'third_party/siso': {
-    'packages': [
-      {
-        'package': 'infra/build/siso/${{platform}}',
-        'version': Var('siso_version'),
-      }
-    ],
-    'dep_type': 'cipd',
-    'condition': 'checkout_siso and dawn_standalone',
-  },
 
   # Misc dependencies inherited from Tint
   'third_party/protobuf': {
@@ -476,34 +461,23 @@
                 '-o', 'third_party/node/node.exe',
     ],
   },
-#  {
-#    # Download remote exec cfg files
-#    'name': 'fetch_reclient_cfgs',
-#    'pattern': '.',
-#    'condition': 'download_remoteexec_cfg',
-#    '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',
-#               '--hook',
-#               ],
-#  },
-  # Configure Siso
-  {
-    'name': 'configure_siso',
-    'pattern': '.',
-    'condition': 'checkout_siso and dawn_standalone',
-    'action': ['python3',
-               'build/config/siso/configure_siso.py',
-               '--rbe_instance',
-               Var('rbe_instance'),
-               ],
-  },
+ {
+   # Download remote exec cfg files
+   'name': 'fetch_reclient_cfgs',
+   'pattern': '.',
+   'condition': 'download_remoteexec_cfg',
+   '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',
+              '--hook',
+              ],
+ },
 ]
 
 recursedeps = [