From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Mon, 8 Jan 2018 07:26:51 +0000 (+0000)
Subject: Merge "Prepare integration of daisy and dovetail"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=de475ca391c9b11a3e76d36487e3b2ee06f364a1;hp=-c;p=releng.git

Merge "Prepare integration of daisy and dovetail"
---

de475ca391c9b11a3e76d36487e3b2ee06f364a1
diff --combined jjb/dovetail/dovetail-run.sh
index 6ffcd3194,b214d8530..e50242bd6
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@@ -13,9 -13,6 +13,9 @@@
  set -e
  [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
  
 +DEPLOY_TYPE=baremetal
 +[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt
 +
  DOVETAIL_HOME=${WORKSPACE}/cvp
  [ -d ${DOVETAIL_HOME} ] && sudo rm -rf ${DOVETAIL_HOME}
  
@@@ -24,8 -21,6 +24,8 @@@ mkdir -p ${DOVETAIL_HOME
  DOVETAIL_CONFIG=${DOVETAIL_HOME}/pre_config
  mkdir -p ${DOVETAIL_CONFIG}
  
 +ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 +
  sshkey=""
  # The path of openrc.sh is defined in fetch_os_creds.sh
  OPENRC=${DOVETAIL_CONFIG}/env_config.sh
@@@ -78,17 -73,13 +78,17 @@@ if [[ -f $OPENRC ]]; the
              exit 1
          fi
      fi
 -    cat $OPENRC
  else
      echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
      sudo ls -al ${DOVETAIL_CONFIG}
      exit 1
  fi
  
 +if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "fuel" ]]; then
 +    sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC}
 +fi
 +cat $OPENRC
 +
  if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then
      cat << EOF >${DOVETAIL_CONFIG}/pod.yaml
  nodes:
@@@ -101,19 -92,6 +101,19 @@@
  EOF
  fi
  
 +if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
 +    fuel_ctl_ssh_options="${ssh_options} -i ${SSH_KEY}"
 +    ssh_user="ubuntu"
 +    fuel_ctl_ip=$(ssh 2>/dev/null ${fuel_ctl_ssh_options} "${ssh_user}@${INSTALLER_IP}" \
 +            "sudo salt --out yaml 'ctl*' pillar.get _param:openstack_control_address | \
 +                awk '{print \$2; exit}'") &> /dev/null
 +    cat << EOF >${DOVETAIL_CONFIG}/pod.yaml
 +nodes:
 +- {ip: ${fuel_ctl_ip}, name: node1, key_filename: /root/.ssh/id_rsa, role: controller, user: ${ssh_user}}
 +
 +EOF
 +fi
 +
  if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then
      set +e
  
@@@ -131,6 -109,8 +131,8 @@@
          options="-u root -p r00tme"
      elif [[ ${INSTALLER_TYPE} == apex ]]; then
          options="-u stack -k /root/.ssh/id_rsa"
+     elif [[ ${INSTALLER_TYPE} == daisy ]]; then
+         options="-u root -p r00tme"
      else
          echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently."
          echo "HA test cases may not run properly."
@@@ -157,13 -137,11 +159,13 @@@ els
      echo "HA test cases may not run properly."
  fi
  
 -ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 -
  if [ "$INSTALLER_TYPE" == "fuel" ]; then
 -    echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
 -    sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_rsa ${DOVETAIL_CONFIG}/id_rsa
 +    if [[ "${SUT_BRANCH}" =~ "danube" ]]; then
 +        echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
 +        sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_rsa ${DOVETAIL_CONFIG}/id_rsa
 +    else
 +        cp ${SSH_KEY} ${DOVETAIL_CONFIG}/id_rsa
 +    fi
  fi
  
  if [ "$INSTALLER_TYPE" == "apex" ]; then
@@@ -171,6 -149,12 +173,12 @@@
      sudo scp $ssh_options stack@${INSTALLER_IP}:~/.ssh/id_rsa ${DOVETAIL_CONFIG}/id_rsa
  fi
  
+ if [ "$INSTALLER_TYPE" == "daisy" ]; then
+     echo "Fetching id_dsa file from jump_server $INSTALLER_IP..."
+     sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_dsa ${DOVETAIL_CONFIG}/id_rsa
+ fi
+ 
+ 
  image_path=${HOME}/opnfv/dovetail/images
  if [[ ! -d ${image_path} ]]; then
      mkdir -p ${image_path}
@@@ -198,26 -182,20 +206,26 @@@ docker_volume="-v /var/run/docker.sock:
  dovetail_home_volume="-v ${DOVETAIL_HOME}:${DOVETAIL_HOME}"
  
  # Pull the image with correct tag
 -echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}"
 -docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
 +DOCKER_REPO='opnfv/dovetail'
 +if [ "$(uname -m)" = 'aarch64' ]; then
 +    DOCKER_REPO="${DOCKER_REPO}_$(uname -m)"
 +    DOCKER_TAG="latest"
 +fi
 +
 +echo "Dovetail: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
 +docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
  
  env4bgpvpn="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
  
  cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
 -     ${sshkey} ${env4bgpvpn} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
 +     ${sshkey} ${env4bgpvpn} ${DOCKER_REPO}:${DOCKER_TAG} /bin/bash"
  echo "Dovetail: running docker run command: ${cmd}"
  ${cmd} >${redirect}
  sleep 5
 -container_id=$(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | awk '{print $1}' | head -1)
 +container_id=$(docker ps | grep "${DOCKER_REPO}:${DOCKER_TAG}" | awk '{print $1}' | head -1)
  echo "Container ID=${container_id}"
  if [ -z ${container_id} ]; then
 -    echo "Cannot find opnfv/dovetail container ID ${container_id}. Please check if it is existing."
 +    echo "Cannot find ${DOCKER_REPO} container ID ${container_id}. Please check if it is existing."
      docker ps -a
      exit 1
  fi
@@@ -225,25 -203,11 +233,25 @@@ echo "Container Start: docker start ${c
  docker start ${container_id}
  sleep 5
  docker ps >${redirect}
 -if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then
 -    echo "The container opnfv/dovetail with ID=${container_id} has not been properly started. Exiting..."
 +if [ $(docker ps | grep "${DOCKER_REPO}:${DOCKER_TAG}" | wc -l) == 0 ]; then
 +    echo "The container ${DOCKER_REPO} with ID=${container_id} has not been properly started. Exiting..."
      exit 1
  fi
  
 +if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
 +    source_cmd="source ${OPENRC}"
 +    get_public_url_cmd="openstack --insecure endpoint list --service keystone --interface public | sed -n 4p | awk '{print \$14}'"
 +    public_url=$(sudo docker exec "$container_id" /bin/bash -c "${source_cmd} && ${get_public_url_cmd}")
 +    sed -i 's#OS_AUTH_URL=.*#OS_AUTH_URL='"${public_url}"'#g' ${OPENRC}
 +    sed -i 's/internal/public/g' ${OPENRC}
 +    if [[ ${public_url} =~ 'v2' ]]; then
 +        sed -i "s/OS_IDENTITY_API_VERSION=3/OS_IDENTITY_API_VERSION=2.0/g" ${OPENRC}
 +        sed -i '/OS_PROJECT_DOMAIN_NAME/d' ${OPENRC}
 +        sed -i '/OS_USER_DOMAIN_NAME/d' ${OPENRC}
 +    fi
 +    cat ${OPENRC}
 +fi
 +
  # Modify tempest_conf.yaml file
  tempest_conf_file=${DOVETAIL_CONFIG}/tempest_conf.yaml
  if [[ ${INSTALLER_TYPE} == 'compass' || ${INSTALLER_TYPE} == 'apex' ]]; then