diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-04-04 12:54:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-04 12:54:12 +0000 |
| commit | a241a5458819cc3488a2e3934daa4a07c662c9dd (patch) | |
| tree | e3bb0a87e7741d63118e80067dd984812c3b1aaa | |
| parent | d350e73e338e02513e75648c668fbadbae6dd535 (diff) | |
| parent | 21c3c7fa27015fb727ce88cd5eb2821138f08283 (diff) | |
Merge "Removing Deprecated ENV handling"
| -rwxr-xr-x | ci/clean.sh | 13 | ||||
| -rwxr-xr-x | ci/deploy.sh | 13 | ||||
| -rwxr-xr-x | ci/util.sh | 13 | ||||
| -rw-r--r-- | contrib/simple_deploy.sh | 4 |
4 files changed, 2 insertions, 41 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 262e74bf..4335b821 100755 --- 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 a395598f..dd038643 100755 --- 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="" @@ -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 f31db3e2..0b9b6caa 100644 --- 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 |