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 "[compass] use liberty in ocl scenario deployment"
[releng.git]
/
jjb
/
yardstick
/
yardstick-daily.sh
diff --git
a/jjb/yardstick/yardstick-daily.sh
b/jjb/yardstick/yardstick-daily.sh
index
3ad6b7c
..
7e9a65b
100755
(executable)
--- a/
jjb/yardstick/yardstick-daily.sh
+++ b/
jjb/yardstick/yardstick-daily.sh
@@
-6,7
+6,7
@@
set -e
labconfig=""
sshkey=""
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
labconfig=""
sshkey=""
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
- instack_mac=$(sudo virsh domiflist
instack
| grep default | \
+ instack_mac=$(sudo virsh domiflist
undercloud
| grep default | \
grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
@@
-23,6
+23,11
@@
elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
# replace the default one by the customized one provided by jenkins config
fi
# replace the default one by the customized one provided by jenkins config
fi
+# 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
+
opts="--privileged=true --rm"
envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
opts="--privileged=true --rm"
envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
@@
-33,7
+38,7
@@
docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
# Run docker
cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
# Run docker
cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
-
run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK
_SUITE_NAME}"
+
exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO
_SUITE_NAME}"
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}