summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-03-16 03:46:03 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-03-16 03:46:03 +0100
commit92e6380e7428b18ac2515a13a2f10fbfd7971c4c (patch)
treeae5803a17b27f70597db7a682a5348990f4bdd9a
parent1e1adaf5f02fd5fa3887386b524932328d8579bb (diff)
Remove iptables and unset privileged flag
Change-Id: I83aafd2cf6317efefaa4b4208b286d5d26231767 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-xjjb/functest/functest-k8.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 3f08e4a0b..5c402d3a7 100755
--- 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}"
-# 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}"
@@ -50,7 +45,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"
-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=$?