Merge "Remove iptables and unset privileged flag"
authorFatih Degirmenci <fdegir@gmail.com>
Mon, 19 Mar 2018 13:02:05 +0000 (13:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 19 Mar 2018 13:02:05 +0000 (13:02 +0000)
1  2 
jjb/functest/functest-k8.sh

@@@ -19,7 -19,7 +19,7 @@@ if [[ ${INSTALLER_TYPE} == 'compass' ]]
      KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2')
      echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file
  elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then
 -    admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/joid_config/config"
 +    admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config"
      rc_file=${HOME}/joid_config/k8config
  else
      echo "Not supported by other installers yet"
@@@ -35,30 -35,20 +35,25 @@@ results_vol="-v ${dir_result}:${FUNCTES
  
  volumes="${rc_file_vol} ${results_vol} ${admin_conf_file_vol}"
  
- # Set iptables rule to allow forwarding return traffic for container
- 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
  envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} \
      -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
      -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
  
  DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}`
  
 +set +e
 +
  FUNCTEST_IMAGE=opnfv/functest-kubernetes:${DOCKER_TAG}
  echo "Pulling Docker image ${FUNCTEST_IMAGE} ..."
  docker pull ${FUNCTEST_IMAGE}>/dev/null
  cmd_opt="run_tests -r -t all"
- cmd="docker run --rm --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+ cmd="docker run --rm ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
  echo "Running Functest k8s test cases, CMD: ${cmd}"
  eval ${cmd}
  ret_value=$?
 +
 +ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 +echo 0 > ${ret_val_file}
  if [ ${ret_value} != 0 ]; then
    echo ${ret_value} > ${ret_val_file}
  fi