environment: Use pip cache
Change-Id: I578c30f767ab814d309178d54e9600bd08e89362
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/49280
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index c3c21c0..a82f3ea 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -85,6 +85,7 @@
self._env['BUILDBUCKET_NAME'] = 'project:bucket:builder'
self._env['GOCACHE'] = self.m.path['cache'].join('go')
+ self._env['PIP_CACHE_DIR'] = self.m.path['cache'].join('pip')
def _init_pigweed(self, checkout_root, top_pres):
"""Run pw_env_setup."""
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index 7a0be57..3413293 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -312,6 +312,7 @@
"CARGO_TARGET_DIR": "[CACHE]/cargo",
"FOO_ROOT": "[START_DIR]",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]",
"PW_ROOT": "[START_DIR]/pigweed"
@@ -361,6 +362,7 @@
"CARGO_TARGET_DIR": "[CACHE]/cargo",
"FOO_ROOT": "[START_DIR]",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]",
"PW_ROOT": "[START_DIR]/pigweed"
@@ -383,6 +385,7 @@
"CARGO_TARGET_DIR": "[CACHE]/cargo",
"FOO_ROOT": "[START_DIR]",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]",
"PW_ROOT": "[START_DIR]/pigweed"
@@ -557,6 +560,7 @@
"CARGO_TARGET_DIR": "[CACHE]/cargo",
"FOO_ROOT": "[START_DIR]",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]",
"PW_ROOT": "[START_DIR]/pigweed",
@@ -591,6 +595,7 @@
"CARGO_TARGET_DIR": "[CACHE]/cargo",
"FOO_ROOT": "[START_DIR]",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]",
"PW_ROOT": "[START_DIR]/pigweed",
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index ec4723a..d8eda69 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -166,6 +166,7 @@
"BUILD_NUMBER": "0",
"FOO_ROOT": "[START_DIR]",
"GOCACHE": "[CACHE]\\go",
+ "PIP_CACHE_DIR": "[CACHE]\\pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]",
"PW_ROOT": "[START_DIR]\\pigweed"
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 8b97098..794c7ad 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -557,6 +557,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -574,6 +575,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -611,6 +613,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -639,6 +642,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -676,6 +680,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/docs_builder.expected/docs.json b/recipes/docs_builder.expected/docs.json
index 4c29bf9..a5c1825 100644
--- a/recipes/docs_builder.expected/docs.json
+++ b/recipes/docs_builder.expected/docs.json
@@ -563,6 +563,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -580,6 +581,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/docs_builder.expected/docs_dry_run.json b/recipes/docs_builder.expected/docs_dry_run.json
index d2fd629..32cc0eb 100644
--- a/recipes/docs_builder.expected/docs_dry_run.json
+++ b/recipes/docs_builder.expected/docs_dry_run.json
@@ -563,6 +563,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -580,6 +581,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/pw_presubmit.expected/pigweed.json b/recipes/pw_presubmit.expected/pigweed.json
index 276d366..13aeafa 100644
--- a/recipes/pw_presubmit.expected/pigweed.json
+++ b/recipes/pw_presubmit.expected/pigweed.json
@@ -569,6 +569,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -598,6 +599,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -624,6 +626,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/pw_presubmit.expected/repo.json b/recipes/pw_presubmit.expected/repo.json
index 8a903fe..59c17fc 100644
--- a/recipes/pw_presubmit.expected/repo.json
+++ b/recipes/pw_presubmit.expected/repo.json
@@ -546,6 +546,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/pw_presubmit.expected/sign-nobuildid.json b/recipes/pw_presubmit.expected/sign-nobuildid.json
index 93d7da3..232ef44 100644
--- a/recipes/pw_presubmit.expected/sign-nobuildid.json
+++ b/recipes/pw_presubmit.expected/sign-nobuildid.json
@@ -566,6 +566,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -590,6 +591,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index 6ab05fd..e27bdd8 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -566,6 +566,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -590,6 +591,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/pw_presubmit.expected/step.json b/recipes/pw_presubmit.expected/step.json
index 9dc7069..c7f4cd0 100644
--- a/recipes/pw_presubmit.expected/step.json
+++ b/recipes/pw_presubmit.expected/step.json
@@ -794,6 +794,7 @@
"BUILDBUCKET_NAME": "project:try:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -822,6 +823,7 @@
"BUILDBUCKET_NAME": "project:try:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -846,6 +848,7 @@
"BUILDBUCKET_NAME": "project:try:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index 6573f9a..e04147d 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -559,6 +559,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 53dda00..edebe07 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -535,6 +535,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -552,6 +553,7 @@
"BUILDBUCKET_NAME": "project:ci:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index d88011b..7366bb9 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -563,6 +563,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -580,6 +581,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/tokendb_updater.expected/separate-repo.json b/recipes/tokendb_updater.expected/separate-repo.json
index 43e7844..5f50040 100644
--- a/recipes/tokendb_updater.expected/separate-repo.json
+++ b/recipes/tokendb_updater.expected/separate-repo.json
@@ -592,6 +592,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -609,6 +610,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index 62a9635..91fe59e 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -563,6 +563,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
@@ -580,6 +581,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index 829f1a3..a26f95c 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -563,6 +563,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 8c3e8e0..e7c49b8 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -563,6 +563,7 @@
"BUILDBUCKET_NAME": "project:bucket:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index ba042be..6630d2f 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -785,6 +785,7 @@
"BUILDBUCKET_NAME": "project:try:builder",
"BUILD_NUMBER": "0",
"GOCACHE": "[CACHE]/go",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
"PW_ENVSETUP_DISABLE_SPINNER": "1",
"PW_PROJECT_ROOT": "[START_DIR]/checkout",
"PW_ROOT": "[START_DIR]/checkout"
