Removing Deprecated ENV handling

Change-Id: I7010fb29bf6927d3d4050d9dd8326a0ec7bc44f1
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/ci/clean.sh b/ci/clean.sh
index 262e74b..4335b82 100755 (executable)
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -12,19 +12,6 @@
 #author: Dan Radez (dradez@redhat.com)
 #author: Tim Rozet (trozet@redhat.com)
 
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
-    echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
-    echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
-    BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
-    echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
-    echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
-    IMAGES=$RESOURCES
-fi
-
 # Use default if no param passed
 BASE=${BASE:-'/var/opt/opnfv'}
 IMAGES=${IMAGES:-"$BASE/images"}

diff --git a/ci/deploy.sh b/ci/deploy.sh
index a395598..dd03864 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -37,19 +37,6 @@ declare -A deploy_options_array
 declare -a performance_options
 declare -A NET_MAP
 
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
-    echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
-    echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
-    BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
-    echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
-    echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
-    IMAGES=$RESOURCES
-fi
-
 APEX_TMP_DIR=$(python3 -c "import tempfile; print(tempfile.mkdtemp())")
 SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error)
 DEPLOY_OPTIONS=""

diff --git a/ci/util.sh b/ci/util.sh
index 34821a7..1a931d0 100755 (executable)
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -2,19 +2,6 @@
 # Utility script used to interact with a deployment
 # @author Tim Rozet (trozet@redhat.com)
 
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
-    echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
-    echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
-    BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
-    echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
-    echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
-    IMAGES=$RESOURCES
-fi
-
 BASE=${BASE:-'/var/opt/opnfv'}
 IMAGES=${IMAGES:-"$BASE/images"}
 LIB=${LIB:-"$BASE/lib"}

diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh
index f31db3e..0b9b6ca 100644 (file)
--- a/contrib/simple_deploy.sh
+++ b/contrib/simple_deploy.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../
-export CONFIG=$apex_home/build
+export BASE=$apex_home/build
 export LIB=$apex_home/lib
-export RESOURCES=$apex_home/.build/
+export IMAGES=$apex_home/.build/
 export PYTHONPATH=$PYTHONPATH:$apex_home/lib/python
 $apex_home/ci/dev_dep_check.sh || true
 $apex_home/ci/clean.sh