Merge "Unset default COMPUTE_USER at the beginning of tests"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Fri, 22 Jul 2016 12:33:07 +0000 (12:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 22 Jul 2016 12:33:07 +0000 (12:33 +0000)
1  2 
tests/run.sh

diff --cc tests/run.sh
@@@ -28,11 -28,8 +28,10 @@@ DOCTOR_ROLE=admi
  SUPPORTED_INSTALLER_TYPES="apex local"
  INSTALLER_TYPE=${INSTALLER_TYPE:-apex}
  INSTALLER_IP=${INSTALLER_IP:-none}
- COMPUTE_USER=${COMPUTE_USER:-none}
  
  ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 +as_doctor_user="--os-username $DOCTOR_USER --os-password $DOCTOR_PW
 +                --os-tenant-name $DOCTOR_PROJECT"
  
  if [[ ! "$SUPPORTED_INSTALLER_TYPES" =~ "$INSTALLER_TYPE" ]] ; then
      echo "ERROR: INSTALLER_TYPE=$INSTALLER_TYPE is not supported."