Merge "Removing _l3 from Apex scenario names in master"

diff --combined jjb/apex/apex-deploy.sh
index a86776b,1e04c1f..4b64fd1
--- 1/jjb/apex/apex-deploy.sh
--- 2/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@@ -59,6 -59,12 +59,12 @@@ els
      fi
  fi
  
+ # rename odl_l3 to odl only for master
+ # this can be removed once all the odl_l3 references
+ # are updated to odl after the danube jobs are removed
+ if [[ "$BUILD_DIRECTORY" == *master* ]]; then
+     DEPLOY_SCENARIO=${DEPLOY_SCENARIO/odl_l3/odl}
+ fi
  if [ -z "$DEPLOY_SCENARIO" ]; then
    echo "Deploy scenario not set!"
    exit 1
@@@ -87,8 -93,8 +93,8 @@@ if [[ "$BUILD_DIRECTORY" == *verify* |
      DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
      NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
      DEPLOY_CMD="$(pwd)/deploy.sh"
 -    RESOURCES="${WORKSPACE}/.build/"
 -    CONFIG="${WORKSPACE}/build"
 +    IMAGES="${WORKSPACE}/.build/"
 +    BASE="${WORKSPACE}/build"
      LIB="${WORKSPACE}/lib"
      # Make sure python34 deps are installed
      for dep_pkg in epel-release python34 python34-PyYAML python34-setuptools; do
@@@ -123,7 -129,7 +129,7 @@@
  # use RPMs
  else
      # find version of RPM
 -    VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-[0-9]{8}')
 +    VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)')
      # build RPM List which already includes base Apex RPM
      for pkg in ${APEX_PKGS}; do
          RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}.noarch.rpm"
@@@ -145,13 -151,13 +151,13 @@@
      DEPLOY_CMD=opnfv-deploy
      DEPLOY_SETTINGS_DIR="/etc/opnfv-apex/"
      NETWORK_SETTINGS_DIR="/etc/opnfv-apex/"
 -    RESOURCES="/var/opt/opnfv/images"
 -    CONFIG="/var/opt/opnfv"
 +    IMAGES="/var/opt/opnfv/images"
 +    BASE="/var/opt/opnfv"
      LIB="/var/opt/opnfv/lib"
  fi
  
  # set env vars to deploy cmd
 -DEPLOY_CMD="CONFIG=${CONFIG} RESOURCES=${RESOURCES} LIB=${LIB} ${DEPLOY_CMD}"
 +DEPLOY_CMD="BASE=${BASE} IMAGES=${IMAGES} LIB=${LIB} ${DEPLOY_CMD}"
  
  if [ "$OPNFV_CLEAN" == 'yes' ]; then
    if sudo test -e '/root/inventory/pod_settings.yaml'; then
@@@ -160,9 -166,9 +166,9 @@@
      clean_opts=''
    fi
    if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *promote* ]]; then
 -    sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh ${clean_opts}
 +    sudo BASE=${BASE} LIB=${LIB} ./clean.sh ${clean_opts}
    else
 -    sudo CONFIG=${CONFIG} LIB=${LIB} opnfv-clean ${clean_opts}
 +    sudo BASE=${BASE} LIB=${LIB} opnfv-clean ${clean_opts}
    fi
  fi