Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove iptables and unset privileged flag"
[releng.git]
/
jjb
/
functest
/
functest-k8.sh
diff --git
a/jjb/functest/functest-k8.sh
b/jjb/functest/functest-k8.sh
index
e331f44
..
49d7163
100755
(executable)
--- a/
jjb/functest/functest-k8.sh
+++ b/
jjb/functest/functest-k8.sh
@@
-35,11
+35,6
@@
results_vol="-v ${dir_result}:${FUNCTEST_DIR}/results"
volumes="${rc_file_vol} ${results_vol} ${admin_conf_file_vol}"
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}"
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}"
@@
-52,7
+47,7
@@
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"
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=$?
echo "Running Functest k8s test cases, CMD: ${cmd}"
eval ${cmd}
ret_value=$?