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 all compass jobs
[releng.git]
/
jjb
/
yardstick
/
yardstick-daily.sh
diff --git
a/jjb/yardstick/yardstick-daily.sh
b/jjb/yardstick/yardstick-daily.sh
index
2fd6848
..
91b3e8e
100755
(executable)
--- a/
jjb/yardstick/yardstick-daily.sh
+++ b/
jjb/yardstick/yardstick-daily.sh
@@
-30,21
+30,14
@@
if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
# If dev lab, credentials may not be the default ones, just provide a path to put them into docker
# replace the default one by the customized one provided by jenkins config
fi
# If dev lab, credentials may not be the default ones, just provide a path to put them into docker
# replace the default one by the customized one provided by jenkins config
fi
-elif [[ ${INSTALLER_TYPE} == '
compass
' ]]; then
- if [[ "${DEPLOY_SCENARIO:0:2}" ==
"k8" ]];
then
+elif [[ ${INSTALLER_TYPE} == '
fuel
' ]]; then
+ if [[ "${DEPLOY_SCENARIO:0:2}" ==
'k8' ]];
then
rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
else
rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
else
- cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert"
- echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh
+ cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
fi
fi
-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
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
+56,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##*/}