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 "criteria field must be 'PASS/FAIL'"
[releng.git]
/
jjb
/
bottlenecks
/
bottlenecks-run-suite.sh
diff --git
a/jjb/bottlenecks/bottlenecks-run-suite.sh
b/jjb/bottlenecks/bottlenecks-run-suite.sh
index
811f9d5
..
cdcf0f0
100644
(file)
--- a/
jjb/bottlenecks/bottlenecks-run-suite.sh
+++ b/
jjb/bottlenecks/bottlenecks-run-suite.sh
@@
-27,6
+27,7
@@
BOTTLENECKS_CONFIG=/tmp
if [[ $SUITE_NAME == *posca* ]]; then
POSCA_SCRIPT=/home/opnfv/bottlenecks/testsuites/posca
if [[ $SUITE_NAME == *posca* ]]; then
POSCA_SCRIPT=/home/opnfv/bottlenecks/testsuites/posca
+ sudo rm -f ${OPENRC}
# Preparing OpenStack RC and Cacert files
echo "BOTTLENECKS INFO: fetching os credentials from $INSTALLER_TYPE"
# Preparing OpenStack RC and Cacert files
echo "BOTTLENECKS INFO: fetching os credentials from $INSTALLER_TYPE"
@@
-46,7
+47,7
@@
if [[ $SUITE_NAME == *posca* ]]; then
if [[ -f ${OPENRC} ]]; then
echo "BOTTLENECKS INFO: openstack credentials path is ${OPENRC}"
if [[ -f ${OPENRC} ]]; then
echo "BOTTLENECKS INFO: openstack credentials path is ${OPENRC}"
- if [[ $INSTALLER_TYPE == 'compass'
&& ${BRANCH} == 'master'
]]; then
+ if [[ $INSTALLER_TYPE == 'compass' ]]; then
echo "BOTTLENECKS INFO: writing ${OS_CACERT} to ${OPENRC}"
echo "export OS_CACERT=${OS_CACERT}" >> ${OPENRC}
fi
echo "BOTTLENECKS INFO: writing ${OS_CACERT} to ${OPENRC}"
echo "export OS_CACERT=${OS_CACERT}" >> ${OPENRC}
fi
@@
-71,13
+72,13
@@
if [[ $SUITE_NAME == *posca* ]]; then
set +e
set +e
- sudo pip install virtualenv
+ sudo
-H
pip install virtualenv
cd ${RELENG_REPO}/modules
sudo virtualenv venv
source venv/bin/activate
cd ${RELENG_REPO}/modules
sudo virtualenv venv
source venv/bin/activate
- sudo pip install -e ./ >/dev/null
- sudo pip install netaddr
+ sudo
-H
pip install -e ./ >/dev/null
+ sudo
-H
pip install netaddr
if [[ ${INSTALLER_TYPE} == compass ]]; then
options="-u root -p root"
if [[ ${INSTALLER_TYPE} == compass ]]; then
options="-u root -p root"