Merge "[fuel] Retire 'BRIDGE' slave param"

diff --combined jjb/fuel/fuel-deploy.sh
index 7fe10c6,ba52ec5..35bf3dc
--- 1/jjb/fuel/fuel-deploy.sh
--- 2/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@@ -38,7 -38,6 +38,6 @@@ f
  
  # set deployment parameters
  export TMPDIR=${HOME}/tmpdir
- BRIDGE=${BRIDGE:-pxebr}
  # shellcheck disable=SC2153
  LAB_NAME=${NODE_NAME/-*}
  # shellcheck disable=SC2153
@@@ -49,6 -48,10 +48,6 @@@ LAB_CONFIG_URL=${LAB_CONFIG_URL:-'ssh:/
  # Fuel requires deploy script to be ran with sudo, Armband does not
  SUDO='sudo -E'
  if [ "${PROJECT}" = 'fuel' ]; then
 -    # Fuel does not use any POD-specific configuration for virtual deploys
 -    if [[ "${NODE_NAME}" =~ "virtual" ]]; then
 -        POD_NAME="virtual_kvm"
 -    fi
      # Fuel currently supports ericsson, intel, lf and zte labs
      if [[ ! "${LAB_NAME}" =~ (ericsson|intel|lf|zte) ]]; then
          echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
@@@ -77,6 -80,7 +76,7 @@@ if [[ "$BRANCH" =~ (danube|euphrates) ]
          rm -rf "${LOCAL_CFG}"
          git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}"
          LAB_CONFIG_ARG="-b file://${LOCAL_CFG}"
+         BRIDGE_ARG="-B ${BRIDGE:-pxebr}"
      else
          LAB_CONFIG_ARG="-b ${LAB_CONFIG_URL}"
      fi
@@@ -88,7 -92,7 +88,7 @@@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_
  # construct the command
  DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh ${LAB_CONFIG_ARG:-} \
      -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} ${ISO_FILE_ARG:-} \
-     -B ${DEFAULT_BRIDGE:-${BRIDGE}} -S ${TMPDIR} \
+     -S ${TMPDIR} ${BRIDGE_ARG:-} \
      -L ${WORKSPACE}/${FUEL_LOG_FILENAME}"
  
  # log info to console