Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Updating yaml file to match other standalone test cases"
[yardstick.git]
/
install.sh
diff --git
a/install.sh
b/install.sh
index
4ca72a7
..
7492934
100755
(executable)
--- a/
install.sh
+++ b/
install.sh
@@
-16,6
+16,7
@@
UBUNTU_ARCHIVE_URL="http://archive.ubuntu.com/ubuntu/"
source /etc/os-release
source_file=/etc/apt/sources.list
source /etc/os-release
source_file=/etc/apt/sources.list
+NSB_DIR="/opt/nsb_bin"
if [[ "${DOCKER_ARCH}" == "aarch64" ]]; then
sed -i -e 's/^deb \([^/[]\)/deb [arch=arm64] \1/g' "${source_file}"
if [[ "${DOCKER_ARCH}" == "aarch64" ]]; then
sed -i -e 's/^deb \([^/[]\)/deb [arch=arm64] \1/g' "${source_file}"
@@
-59,6
+60,7
@@
echo "vm.mmap_min_addr = 0" > /etc/sysctl.d/mmap_min_addr.conf
# install tools
apt-get update && apt-get install -y \
qemu-user-static/xenial \
# install tools
apt-get update && apt-get install -y \
qemu-user-static/xenial \
+ bonnie++ \
wget \
expect \
curl \
wget \
expect \
curl \
@@
-78,7
+80,12
@@
apt-get update && apt-get install -y \
uwsgi-plugin-python \
supervisor \
python-pip \
uwsgi-plugin-python \
supervisor \
python-pip \
- vim
+ vim \
+ libxft-dev \
+ libxss-dev \
+ sudo \
+ iputils-ping \
+ rabbitmq-server
if [[ "${DOCKER_ARCH}" != "aarch64" ]]; then
apt-get install -y libc6:arm64
if [[ "${DOCKER_ARCH}" != "aarch64" ]]; then
apt-get install -y libc6:arm64
@@
-88,9
+95,14
@@
apt-get -y autoremove && apt-get clean
git config --global http.sslVerify false
git config --global http.sslVerify false
+# Start and configure RabbitMQ
+service rabbitmq-server restart
+rabbitmqctl start_app
+rabbitmqctl add_user yardstick yardstick
+rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
# install yardstick + dependencies
# install yardstick + dependencies
-easy_install -U pip
+easy_install -U pip
==9.0.1
pip install -r requirements.txt
pip install -e .
pip install -r requirements.txt
pip install -e .
@@
-100,5
+112,11
@@
cd "${PWD}/gui" && /bin/bash gui.sh
mkdir -p /etc/nginx/yardstick
mv dist /etc/nginx/yardstick/gui
mkdir -p /etc/nginx/yardstick
mv dist /etc/nginx/yardstick/gui
+mkdir -p ${NSB_DIR}
+
+wget -P ${NSB_DIR}/ http://artifacts.opnfv.org/yardstick/third-party/trex_client.tar.gz
+tar xvf ${NSB_DIR}/trex_client.tar.gz -C ${NSB_DIR}
+rm -f ${NSB_DIR}/trex_client.tar.gz
+
service nginx restart
service nginx restart
-uwsgi -i /etc/yardstick/yardstick.ini
+uwsgi -i /etc/yardstick/yardstick.ini
\ No newline at end of file