Opt out of Jiri analytics, enable SSO rewriting
Change-Id: I3780f9ab1e4989b9b0e4391f67b106a7a21e9db4
diff --git a/README.recipes.md b/README.recipes.md
index c3e0acb..abf7e8b 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -322,31 +322,31 @@
Return a jiri command step.
-— **def [checkout](/recipe_modules/jiri/api.py#162)(self, manifest, remote, patch_ref=None, patch_gerrit_url=None, project=None):**
+— **def [checkout](/recipe_modules/jiri/api.py#164)(self, manifest, remote, patch_ref=None, patch_gerrit_url=None, project=None):**
-— **def [clean](/recipe_modules/jiri/api.py#90)(self, all=False, \*\*kwargs):**
+— **def [clean](/recipe_modules/jiri/api.py#92)(self, all=False, \*\*kwargs):**
-— **def [edit\_manifest](/recipe_modules/jiri/api.py#109)(self, manifest, projects=None, imports=None, \*\*kwargs):**
+— **def [edit\_manifest](/recipe_modules/jiri/api.py#111)(self, manifest, projects=None, imports=None, \*\*kwargs):**
— **def [ensure\_jiri](/recipe_modules/jiri/api.py#22)(self, version=None):**
-— **def [import\_manifest](/recipe_modules/jiri/api.py#99)(self, manifest, remote, name=None, overwrite=False, \*\*kwargs):**
+— **def [import\_manifest](/recipe_modules/jiri/api.py#101)(self, manifest, remote, name=None, overwrite=False, \*\*kwargs):**
— **def [init](/recipe_modules/jiri/api.py#39)(self, dir=None, \*\*kwargs):**
  **@property**<br>— **def [jiri](/recipe_modules/jiri/api.py#35)(self):**
-— **def [patch](/recipe_modules/jiri/api.py#127)(self, ref, host=None, delete=False, force=False, rebase=False, \*\*kwargs):**
+— **def [patch](/recipe_modules/jiri/api.py#129)(self, ref, host=None, delete=False, force=False, rebase=False, \*\*kwargs):**
-— **def [project](/recipe_modules/jiri/api.py#50)(self, projects, test_data=None):**
+— **def [project](/recipe_modules/jiri/api.py#52)(self, projects, test_data=None):**
-— **def [run\_hooks](/recipe_modules/jiri/api.py#84)(self, local_manifest=False):**
+— **def [run\_hooks](/recipe_modules/jiri/api.py#86)(self, local_manifest=False):**
-— **def [snapshot](/recipe_modules/jiri/api.py#142)(self, file=None, test_data=None, \*\*kwargs):**
+— **def [snapshot](/recipe_modules/jiri/api.py#144)(self, file=None, test_data=None, \*\*kwargs):**
-— **def [source\_manifest](/recipe_modules/jiri/api.py#152)(self, file=None, test_data=None, \*\*kwargs):**
+— **def [source\_manifest](/recipe_modules/jiri/api.py#154)(self, file=None, test_data=None, \*\*kwargs):**
-— **def [update](/recipe_modules/jiri/api.py#68)(self, gc=False, run_hooks=True, snapshot=None, local_manifest=False, \*\*kwargs):**
+— **def [update](/recipe_modules/jiri/api.py#70)(self, gc=False, run_hooks=True, snapshot=None, local_manifest=False, \*\*kwargs):**
### *recipe_modules* / [qemu](/recipe_modules/qemu)
[DEPS](/recipe_modules/qemu/__init__.py#1): [cipd](#recipe_modules-cipd), [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/recipe_modules/jiri/api.py b/recipe_modules/jiri/api.py
index 10cf1c3..7b61204 100644
--- a/recipe_modules/jiri/api.py
+++ b/recipe_modules/jiri/api.py
@@ -39,6 +39,8 @@
def init(self, dir=None, **kwargs):
cmd = [
'init',
+ '-analytics-opt=false',
+ '-rewrite-sso-to-https=true',
'-cache', self.m.path['cache'].join('git'),
'-shared',
]
diff --git a/recipe_modules/jiri/examples/full.expected/basic.json b/recipe_modules/jiri/examples/full.expected/basic.json
index 0f4c921..667264c 100644
--- a/recipe_modules/jiri/examples/full.expected/basic.json
+++ b/recipe_modules/jiri/examples/full.expected/basic.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
@@ -100,6 +102,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared",
diff --git a/recipes/clang_toolchain.expected/linux.json b/recipes/clang_toolchain.expected/linux.json
index 1706eb9..21bb489 100644
--- a/recipes/clang_toolchain.expected/linux.json
+++ b/recipes/clang_toolchain.expected/linux.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/clang_toolchain.expected/linux_new.json b/recipes/clang_toolchain.expected/linux_new.json
index 948f452..d7640f4 100644
--- a/recipes/clang_toolchain.expected/linux_new.json
+++ b/recipes/clang_toolchain.expected/linux_new.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/clang_toolchain.expected/mac.json b/recipes/clang_toolchain.expected/mac.json
index a6a7227..77c9ec8 100644
--- a/recipes/clang_toolchain.expected/mac.json
+++ b/recipes/clang_toolchain.expected/mac.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/clang_toolchain.expected/mac_new.json b/recipes/clang_toolchain.expected/mac_new.json
index f8cd71c..a2a3d6f 100644
--- a/recipes/clang_toolchain.expected/mac_new.json
+++ b/recipes/clang_toolchain.expected/mac_new.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/cobalt.expected/ci.json b/recipes/cobalt.expected/ci.json
index e9a4c20..640fe74 100644
--- a/recipes/cobalt.expected/ci.json
+++ b/recipes/cobalt.expected/ci.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/cobalt.expected/cq_try.json b/recipes/cobalt.expected/cq_try.json
index 154d2f6..2c4eeb6 100644
--- a/recipes/cobalt.expected/cq_try.json
+++ b/recipes/cobalt.expected/cq_try.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/arm64_skip_tests.json b/recipes/fuchsia.expected/arm64_skip_tests.json
index 5366f16..0e9a679 100644
--- a/recipes/fuchsia.expected/arm64_skip_tests.json
+++ b/recipes/fuchsia.expected/arm64_skip_tests.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/autorun_backtrace.json b/recipes/fuchsia.expected/autorun_backtrace.json
index 2006b64..c545c41 100644
--- a/recipes/fuchsia.expected/autorun_backtrace.json
+++ b/recipes/fuchsia.expected/autorun_backtrace.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/autorun_failed_qemu.json b/recipes/fuchsia.expected/autorun_failed_qemu.json
index 8c0876f..bcb90d1 100644
--- a/recipes/fuchsia.expected/autorun_failed_qemu.json
+++ b/recipes/fuchsia.expected/autorun_failed_qemu.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/autorun_failed_tests.json b/recipes/fuchsia.expected/autorun_failed_tests.json
index 0cc1902..dedc698 100644
--- a/recipes/fuchsia.expected/autorun_failed_tests.json
+++ b/recipes/fuchsia.expected/autorun_failed_tests.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/autorun_no_results.json b/recipes/fuchsia.expected/autorun_no_results.json
index ed0b17e..01503a8 100644
--- a/recipes/fuchsia.expected/autorun_no_results.json
+++ b/recipes/fuchsia.expected/autorun_no_results.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/autorun_tests.json b/recipes/fuchsia.expected/autorun_tests.json
index cf1cbe6..c7e051a 100644
--- a/recipes/fuchsia.expected/autorun_tests.json
+++ b/recipes/fuchsia.expected/autorun_tests.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/autorun_tests_timeout.json b/recipes/fuchsia.expected/autorun_tests_timeout.json
index a4252bb..1b742d1 100644
--- a/recipes/fuchsia.expected/autorun_tests_timeout.json
+++ b/recipes/fuchsia.expected/autorun_tests_timeout.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/backtrace.json b/recipes/fuchsia.expected/backtrace.json
index 7bf7649..1aef439 100644
--- a/recipes/fuchsia.expected/backtrace.json
+++ b/recipes/fuchsia.expected/backtrace.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/cq.json b/recipes/fuchsia.expected/cq.json
index 84a0950..8e50e1a 100644
--- a/recipes/fuchsia.expected/cq.json
+++ b/recipes/fuchsia.expected/cq.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/default.json b/recipes/fuchsia.expected/default.json
index dab90ac..7afd2bb 100644
--- a/recipes/fuchsia.expected/default.json
+++ b/recipes/fuchsia.expected/default.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/failed_tests.json b/recipes/fuchsia.expected/failed_tests.json
index e2add71..4c1356a 100644
--- a/recipes/fuchsia.expected/failed_tests.json
+++ b/recipes/fuchsia.expected/failed_tests.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/garnet.json b/recipes/fuchsia.expected/garnet.json
index fab4dda..2248041 100644
--- a/recipes/fuchsia.expected/garnet.json
+++ b/recipes/fuchsia.expected/garnet.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/gn_args.json b/recipes/fuchsia.expected/gn_args.json
index 5851141..22f18ae 100644
--- a/recipes/fuchsia.expected/gn_args.json
+++ b/recipes/fuchsia.expected/gn_args.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/goma_local_cache.json b/recipes/fuchsia.expected/goma_local_cache.json
index d4f5c1d..98b797c 100644
--- a/recipes/fuchsia.expected/goma_local_cache.json
+++ b/recipes/fuchsia.expected/goma_local_cache.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/lto.json b/recipes/fuchsia.expected/lto.json
index f75c48b..d150c25 100644
--- a/recipes/fuchsia.expected/lto.json
+++ b/recipes/fuchsia.expected/lto.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/manifest.json b/recipes/fuchsia.expected/manifest.json
index 84a0950..8e50e1a 100644
--- a/recipes/fuchsia.expected/manifest.json
+++ b/recipes/fuchsia.expected/manifest.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/no_goma.json b/recipes/fuchsia.expected/no_goma.json
index 9a12989..20b5232 100644
--- a/recipes/fuchsia.expected/no_goma.json
+++ b/recipes/fuchsia.expected/no_goma.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/peridot.json b/recipes/fuchsia.expected/peridot.json
index 856f14e..38dd290 100644
--- a/recipes/fuchsia.expected/peridot.json
+++ b/recipes/fuchsia.expected/peridot.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/release.json b/recipes/fuchsia.expected/release.json
index 40f29a9..990e617 100644
--- a/recipes/fuchsia.expected/release.json
+++ b/recipes/fuchsia.expected/release.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/tests.json b/recipes/fuchsia.expected/tests.json
index 09d4e61..4054344 100644
--- a/recipes/fuchsia.expected/tests.json
+++ b/recipes/fuchsia.expected/tests.json
@@ -127,6 +127,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/fuchsia.expected/thinlto.json b/recipes/fuchsia.expected/thinlto.json
index a0094bf..0796451 100644
--- a/recipes/fuchsia.expected/thinlto.json
+++ b/recipes/fuchsia.expected/thinlto.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/go_toolchain.expected/linux.json b/recipes/go_toolchain.expected/linux.json
index 28e793b..254cdc4 100644
--- a/recipes/go_toolchain.expected/linux.json
+++ b/recipes/go_toolchain.expected/linux.json
@@ -93,6 +93,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/go_toolchain.expected/linux_new.json b/recipes/go_toolchain.expected/linux_new.json
index 086937d..9985366 100644
--- a/recipes/go_toolchain.expected/linux_new.json
+++ b/recipes/go_toolchain.expected/linux_new.json
@@ -93,6 +93,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/go_toolchain.expected/mac.json b/recipes/go_toolchain.expected/mac.json
index 5f3bd50..dd1f94b 100644
--- a/recipes/go_toolchain.expected/mac.json
+++ b/recipes/go_toolchain.expected/mac.json
@@ -93,6 +93,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/go_toolchain.expected/mac_new.json b/recipes/go_toolchain.expected/mac_new.json
index 24c3fbb..03196d1 100644
--- a/recipes/go_toolchain.expected/mac_new.json
+++ b/recipes/go_toolchain.expected/mac_new.json
@@ -93,6 +93,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/jiri.expected/ci.json b/recipes/jiri.expected/ci.json
index e674fdd..d6d1090 100644
--- a/recipes/jiri.expected/ci.json
+++ b/recipes/jiri.expected/ci.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/jiri.expected/ci_new.json b/recipes/jiri.expected/ci_new.json
index f6a202b..8e455cc 100644
--- a/recipes/jiri.expected/ci_new.json
+++ b/recipes/jiri.expected/ci_new.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/jiri.expected/cq_try.json b/recipes/jiri.expected/cq_try.json
index 394eadb..e9323eb 100644
--- a/recipes/jiri.expected/cq_try.json
+++ b/recipes/jiri.expected/cq_try.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/modules.expected/basic.json b/recipes/modules.expected/basic.json
index 4dd67de..9f5d042 100644
--- a/recipes/modules.expected/basic.json
+++ b/recipes/modules.expected/basic.json
@@ -67,6 +67,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/modules.expected/cq.json b/recipes/modules.expected/cq.json
index 8889ed4..4eb787c 100644
--- a/recipes/modules.expected/cq.json
+++ b/recipes/modules.expected/cq.json
@@ -67,6 +67,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/qemu.expected/linux.json b/recipes/qemu.expected/linux.json
index f75d202..13296d9 100644
--- a/recipes/qemu.expected/linux.json
+++ b/recipes/qemu.expected/linux.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/qemu.expected/linux_new.json b/recipes/qemu.expected/linux_new.json
index 2730e52..8b227e6 100644
--- a/recipes/qemu.expected/linux_new.json
+++ b/recipes/qemu.expected/linux_new.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/qemu.expected/mac.json b/recipes/qemu.expected/mac.json
index b35711a..3eb50ec 100644
--- a/recipes/qemu.expected/mac.json
+++ b/recipes/qemu.expected/mac.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/qemu.expected/mac_new.json b/recipes/qemu.expected/mac_new.json
index 22beefb..d4e3ddf 100644
--- a/recipes/qemu.expected/mac_new.json
+++ b/recipes/qemu.expected/mac_new.json
@@ -63,6 +63,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index ea113ba..1e6df45 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/sdk.expected/ci.json b/recipes/sdk.expected/ci.json
index e9671da..dbe4e63 100644
--- a/recipes/sdk.expected/ci.json
+++ b/recipes/sdk.expected/ci.json
@@ -125,6 +125,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/sdk.expected/cq_try.json b/recipes/sdk.expected/cq_try.json
index 7b7cc9b..1e1c3b4 100644
--- a/recipes/sdk.expected/cq_try.json
+++ b/recipes/sdk.expected/cq_try.json
@@ -125,6 +125,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/sdk.expected/no_goma.json b/recipes/sdk.expected/no_goma.json
index eafb7af..c3888fb 100644
--- a/recipes/sdk.expected/no_goma.json
+++ b/recipes/sdk.expected/no_goma.json
@@ -93,6 +93,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/third_party_rust_crates.expected/basic.json b/recipes/third_party_rust_crates.expected/basic.json
index c6f4a70..5e0ec31 100644
--- a/recipes/third_party_rust_crates.expected/basic.json
+++ b/recipes/third_party_rust_crates.expected/basic.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/third_party_rust_crates.expected/patch.json b/recipes/third_party_rust_crates.expected/patch.json
index c6f4a70..5e0ec31 100644
--- a/recipes/third_party_rust_crates.expected/patch.json
+++ b/recipes/third_party_rust_crates.expected/patch.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/web_view.expected/default.json b/recipes/web_view.expected/default.json
index f5448e4..7a15d1e 100644
--- a/recipes/web_view.expected/default.json
+++ b/recipes/web_view.expected/default.json
@@ -95,6 +95,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/asan.json b/recipes/zircon.expected/asan.json
index f7c43b4..d8b9d3d 100644
--- a/recipes/zircon.expected/asan.json
+++ b/recipes/zircon.expected/asan.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/build_rpi.json b/recipes/zircon.expected/build_rpi.json
index c991949..0e71d48 100644
--- a/recipes/zircon.expected/build_rpi.json
+++ b/recipes/zircon.expected/build_rpi.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/ci.json b/recipes/zircon.expected/ci.json
index 3a28c4d..1e9dc92 100644
--- a/recipes/zircon.expected/ci.json
+++ b/recipes/zircon.expected/ci.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/cq_try.json b/recipes/zircon.expected/cq_try.json
index 451be4b..9b95147 100644
--- a/recipes/zircon.expected/cq_try.json
+++ b/recipes/zircon.expected/cq_try.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/failed_qemu.json b/recipes/zircon.expected/failed_qemu.json
index cf9ca86..9080177 100644
--- a/recipes/zircon.expected/failed_qemu.json
+++ b/recipes/zircon.expected/failed_qemu.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/lto.json b/recipes/zircon.expected/lto.json
index 7a7b539..d3c7827 100644
--- a/recipes/zircon.expected/lto.json
+++ b/recipes/zircon.expected/lto.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/no_run_tests.json b/recipes/zircon.expected/no_run_tests.json
index 1622388..f2ab312 100644
--- a/recipes/zircon.expected/no_run_tests.json
+++ b/recipes/zircon.expected/no_run_tests.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/qemu_timeout.json b/recipes/zircon.expected/qemu_timeout.json
index 2db97aa..fb9d08e 100644
--- a/recipes/zircon.expected/qemu_timeout.json
+++ b/recipes/zircon.expected/qemu_timeout.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/symbolized_output.json b/recipes/zircon.expected/symbolized_output.json
index 2f6905f..6c61cdf 100644
--- a/recipes/zircon.expected/symbolized_output.json
+++ b/recipes/zircon.expected/symbolized_output.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/test_ouput.json b/recipes/zircon.expected/test_ouput.json
index 1ce122e..b6be344 100644
--- a/recipes/zircon.expected/test_ouput.json
+++ b/recipes/zircon.expected/test_ouput.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon.expected/thinlto.json b/recipes/zircon.expected/thinlto.json
index 7f84d93..e33cb8a 100644
--- a/recipes/zircon.expected/thinlto.json
+++ b/recipes/zircon.expected/thinlto.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
diff --git a/recipes/zircon_roller.expected/basic.json b/recipes/zircon_roller.expected/basic.json
index aedb999..cfb3fb3 100644
--- a/recipes/zircon_roller.expected/basic.json
+++ b/recipes/zircon_roller.expected/basic.json
@@ -33,6 +33,8 @@
"cmd": [
"[START_DIR]/cipd/jiri/jiri",
"init",
+ "-analytics-opt=false",
+ "-rewrite-sso-to-https=true",
"-cache",
"[CACHE]/git",
"-shared"
