commit e7317d6bf8413cf249ebfd4d9e22e0a251261c7f
author Rob Mohr <mohrr@google.com> Thu Jan 09 12:40:02 2020 -0800
committer Rob Mohr <mohrr@google.com> Thu Jan 09 20:58:36 2020 +0000
tree 41bec595b3bbd0102d4c4299065a5e9db88a7c25
parent b112554a0bea4c8a45e4f17e9371cc2acccf3c56

Add CIPD env var

Make environment in swarming match developer environment more closely.

Change-Id: I291aa84d2071f2a37aebb0cfa44d622bf4698bad

recipe_modules/environment/api.py

diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index 6b680d1..239a394 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -77,6 +77,7 @@
       self._ldpath_prefixes.append(self._cipd_dir)
       self._ldpath_prefixes.append(self._cipd_dir.join('lib'))
       self._env['CIPD_INSTALL_DIR'] = self._cipd_dir
+      self._env['PIGWEED_CIPD_INSTALL_DIR'] = self._cipd_dir
 
   def _all_python_packages(self, checkout_root):
     """Return all folders with setup.py entries.

recipe_modules/environment/tests/full.expected/simple.json

diff --git a/recipe_modules/environment/tests/full.expected/simple.json b/recipe_modules/environment/tests/full.expected/simple.json
index 5d04279..22f8e37 100644
--- a/recipe_modules/environment/tests/full.expected/simple.json
+++ b/recipe_modules/environment/tests/full.expected/simple.json
@@ -114,6 +114,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]"
     },
     "env_prefixes": {
@@ -142,6 +143,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]"
     },
     "env_prefixes": {
@@ -177,6 +179,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },
@@ -207,6 +210,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },

recipes/pigweed.expected/pigweed.json

diff --git a/recipes/pigweed.expected/pigweed.json b/recipes/pigweed.expected/pigweed.json
index 8329e1e..f04aa2b 100644
--- a/recipes/pigweed.expected/pigweed.json
+++ b/recipes/pigweed.expected/pigweed.json
@@ -391,6 +391,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout"
     },
     "env_prefixes": {
@@ -419,6 +420,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout"
     },
     "env_prefixes": {
@@ -454,6 +456,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },
@@ -484,6 +487,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },
@@ -516,6 +520,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },

recipes/pigweed.expected/step.json

diff --git a/recipes/pigweed.expected/step.json b/recipes/pigweed.expected/step.json
index d4a3067..2c6b050 100644
--- a/recipes/pigweed.expected/step.json
+++ b/recipes/pigweed.expected/step.json
@@ -671,6 +671,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout"
     },
     "env_prefixes": {
@@ -699,6 +700,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout"
     },
     "env_prefixes": {
@@ -734,6 +736,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },
@@ -764,6 +767,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },
@@ -798,6 +802,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },
@@ -829,6 +834,7 @@
     ],
     "env": {
       "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
+      "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
       "PW_ROOT": "[START_DIR]/checkout",
       "VIRTUAL_ENV": "[START_DIR]/venv"
     },