Merge "Integrate functest with ARM Architecture with alpine images"

diff --combined jjb/functest/functest-alpine.sh
index cc832a4,eb07f31..81aee0d
--- 1/jjb/functest/functest-alpine.sh
--- 2/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@@ -54,8 -54,9 +54,9 @@@ envs="-e INSTALLER_TYPE=${INSTALLER_TYP
      -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
      -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
  
+ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+ 
  if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-ha'* ]]; then
-     ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
      openo_msb_port=${openo_msb_port:-80}
      openo_msb_endpoint="$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \
      'mysql -ucompass -pcompass -Dcompass -e "select package_config from cluster;" \
@@@ -64,6 -65,12 +65,12 @@@
      envs=${env}" -e OPENO_MSB_ENDPOINT=${openo_msb_endpoint}"
  fi
  
+ if [ "${INSTALLER_TYPE}" == 'fuel' ] && [ "$BRANCH" != 'stable/danube' ]; then
+     COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
+         "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
+     envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
+ fi
+ 
  volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file_vol}"
  
  set +e
@@@ -71,11 -78,7 +78,11 @@@
  if [ ${FUNCTEST_SUITE_NAME} == 'healthcheck' ]; then
      tiers=(healthcheck)
  else
 -    tiers=(healthcheck smoke features vnf)
 +    if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
 +        tiers=(healthcheck smoke features vnf parser)
 +    else
 +        tiers=(healthcheck smoke features)
 +    fi
  fi
  
  cmd_opt='prepare_env start && run_tests -r -t all'
@@@ -84,7 -87,7 +91,7 @@@ for tier in ${tiers[@]}; d
      FUNCTEST_IMAGE=opnfv/functest-${tier}
      echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
      docker pull ${FUNCTEST_IMAGE}>/dev/null
 -    cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
 +    cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
      echo "Running Functest tier '${tier}'. CMD: ${cmd}"
      eval ${cmd}
  done