Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove functest-parser
[releng.git]
/
jjb
/
functest
/
functest-alpine.sh
diff --git
a/jjb/functest/functest-alpine.sh
b/jjb/functest/functest-alpine.sh
index
392f192
..
4340a0c
100755
(executable)
--- a/
jjb/functest/functest-alpine.sh
+++ b/
jjb/functest/functest-alpine.sh
@@
-69,8
+69,6
@@
run_test() {
FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
- parser-basics)
- FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;;
*)
echo "Unkown test case $test_name"
exit 1
*)
echo "Unkown test case $test_name"
exit 1
@@
-109,11
+107,6
@@
fi
rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
-# 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
-
echo "Functest: Start Docker and prepare environment"
echo "Functest: Download images that will be used by test cases"
echo "Functest: Start Docker and prepare environment"
echo "Functest: Download images that will be used by test cases"
@@
-174,9
+167,9
@@
elif [ ${FUNCTEST_MODE} == 'tier' ]; then
run_tiers ${tiers}
else
if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
run_tiers ${tiers}
else
if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
- tiers=(healthcheck smoke features vnf
parser
)
+ tiers=(healthcheck smoke features vnf)
else
else
- tiers=(healthcheck smoke features
parser
)
+ tiers=(healthcheck smoke features)
fi
run_tiers ${tiers}
fi
fi
run_tiers ${tiers}
fi