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 "[docs] Limit git submodule recurse to depth 1"
[releng.git]
/
jjb
/
yardstick
/
yardstick-daily.sh
diff --git
a/jjb/yardstick/yardstick-daily.sh
b/jjb/yardstick/yardstick-daily.sh
index
2fd6848
..
58d590c
100755
(executable)
--- a/
jjb/yardstick/yardstick-daily.sh
+++ b/
jjb/yardstick/yardstick-daily.sh
@@
-41,10
+41,6
@@
elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
fi
cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
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} \
opts="--privileged=true --rm"
envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
@@
-63,6
+59,7
@@
if [ "$(uname -m)" = 'aarch64' ]; then
fi
echo "Yardstick: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
fi
echo "Yardstick: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
+docker images
# map log directory
branch=${BRANCH##*/}
# map log directory
branch=${BRANCH##*/}