Remove variables without "PW_" prefix
Change-Id: I95d2a62b79d31319f815a18fd30b68926fcd823f
diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index f830efa..b31dbb4 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -76,10 +76,6 @@
self._path_prefixes.append(self._cipd_dir.join('bin'))
self._ldpath_prefixes.append(self._cipd_dir)
self._ldpath_prefixes.append(self._cipd_dir.join('lib'))
- # TODO(mohrr) remove these variables once no longer used.
- self._env['CIPD_INSTALL_DIR'] = self._cipd_dir
- self._env['PIGWEED_CIPD_INSTALL_DIR'] = self._cipd_dir
- # End variables to remove.
self._env['PW_CIPD_INSTALL_DIR'] = self._cipd_dir
self._env['PW_PIGWEED_CIPD_INSTALL_DIR'] = self._cipd_dir
diff --git a/recipe_modules/environment/tests/full.expected/simple.json b/recipe_modules/environment/tests/full.expected/simple.json
index 47fa90e..8652199 100644
--- a/recipe_modules/environment/tests/full.expected/simple.json
+++ b/recipe_modules/environment/tests/full.expected/simple.json
@@ -113,8 +113,6 @@
"[START_DIR]/venv"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]"
@@ -144,8 +142,6 @@
"pip"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]"
@@ -182,8 +178,6 @@
"--editable=[START_DIR]/pw_presubmit/py"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
@@ -215,8 +209,6 @@
"[START_DIR]/env_setup/virtualenv/requirements.txt"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]",
diff --git a/recipes/pigweed.expected/pigweed.json b/recipes/pigweed.expected/pigweed.json
index 57f7ba2..b5e4799 100644
--- a/recipes/pigweed.expected/pigweed.json
+++ b/recipes/pigweed.expected/pigweed.json
@@ -390,8 +390,6 @@
"[START_DIR]/venv"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
@@ -421,8 +419,6 @@
"pip"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
@@ -459,8 +455,6 @@
"--editable=[START_DIR]/checkout/pw_presubmit/py"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
@@ -492,8 +486,6 @@
"[START_DIR]/checkout/env_setup/virtualenv/requirements.txt"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
@@ -527,8 +519,6 @@
"out"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
diff --git a/recipes/pigweed.expected/step.json b/recipes/pigweed.expected/step.json
index 616e8b1..421a561 100644
--- a/recipes/pigweed.expected/step.json
+++ b/recipes/pigweed.expected/step.json
@@ -670,8 +670,6 @@
"[START_DIR]/venv"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
@@ -701,8 +699,6 @@
"pip"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout"
@@ -739,8 +735,6 @@
"--editable=[START_DIR]/checkout/pw_presubmit/py"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
@@ -772,8 +766,6 @@
"[START_DIR]/checkout/env_setup/virtualenv/requirements.txt"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
@@ -809,8 +801,6 @@
"step1"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
@@ -843,8 +833,6 @@
"step2"
],
"env": {
- "CIPD_INSTALL_DIR": "[START_DIR]/cipd",
- "PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_PIGWEED_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
"PW_ROOT": "[START_DIR]/checkout",
