Merge "[fuel] Accept arm clusters as valid deploy targets"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Tue, 18 Sep 2018 21:08:10 +0000 (21:08 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 18 Sep 2018 21:08:10 +0000 (21:08 +0000)
1  2 
jjb/fuel/fuel-deploy.sh

diff --combined jjb/fuel/fuel-deploy.sh
@@@ -49,7 -49,7 +49,7 @@@ LAB_CONFIG_URL=${LAB_CONFIG_URL:-'ssh:/
  SUDO='sudo -E'
  if [ "${PROJECT}" = 'fuel' ]; then
      # Fuel currently supports ericsson, intel, lf and zte labs
-     if [[ ! "${LAB_NAME}" =~ (ericsson|intel|lf|zte) ]]; then
+     if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then
          echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
          exit 1
      fi
@@@ -111,6 -111,15 +111,6 @@@ ech
  ${DEPLOY_COMMAND}
  exit_code=$?
  
 -# Temporary workaround for ericsson-virtual* PODs functest integration
 -# See https://jira.opnfv.org/browse/FUNCTEST-985
 -# Set iptables rule to allow forwarding return traffic for container
 -redirect=/dev/stdout
 -if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || \
 -   ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
 -     sudo iptables -I FORWARD -j RETURN
 -fi
 -
  echo
  echo "--------------------------------------------------------"
  echo "Deployment is done!"