X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=install.sh;h=74929345d169a469a9666c8951701939a9e0bfb5;hb=refs%2Fchanges%2F63%2F59163%2F4;hp=ad14b8e0bcde0cdefa03e5692932681d028f1962;hpb=917dea49415183eaff6d2f2fbf32ddeff64d9dfe;p=yardstick.git

diff --git a/install.sh b/install.sh
index ad14b8e0b..74929345d 100755
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,9 @@ DOCKER_ARCH="$(uname -m)"
 UBUNTU_PORTS_URL="http://ports.ubuntu.com/ubuntu-ports/"
 UBUNTU_ARCHIVE_URL="http://archive.ubuntu.com/ubuntu/"
 
+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}"
@@ -33,24 +35,32 @@ else
 fi
 
 sed -i -e 's/^deb-src /# deb-src /g' "${source_file}"
-echo "APT::Default-Release \"trusty\";" > /etc/apt/apt.conf.d/default-distro
+
+VERSION_CODENAME=${VERSION_CODENAME:-trusty}
+
+echo "APT::Default-Release \""${VERSION_CODENAME}"\";" > /etc/apt/apt.conf.d/default-distro
 
 sub_source_file=/etc/apt/sources.list.d/yardstick.list
 touch "${sub_source_file}"
 
 # first add xenial repo needed for installing qemu_static_user/xenial in the container
 # then add complementary architecture repositories in case the cloud image is of different arch
-echo -e "deb [arch="${DOCKER_ARCH}"] "${DOCKER_REPO}" xenial-updates universe
-deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" trusty main universe multiverse restricted
-deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" trusty-updates main universe multiverse restricted
-deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" trusty-security main universe multiverse restricted
-deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" trusty-proposed main universe multiverse restricted" > "${sub_source_file}"
+if [[ "${VERSION_CODENAME}" != "xenial" ]]; then
+    REPO_UPDATE="deb [arch="${DOCKER_ARCH}"] "${DOCKER_REPO}" xenial-updates universe"
+fi
+
+echo -e ""${REPO_UPDATE}"
+deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" "${VERSION_CODENAME}" main universe multiverse restricted
+deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" "${VERSION_CODENAME}"-updates main universe multiverse restricted
+deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" "${VERSION_CODENAME}"-security main universe multiverse restricted
+deb [arch="${EXTRA_ARCH}"] "${EXTRA_REPO}" "${VERSION_CODENAME}"-proposed main universe multiverse restricted" > "${sub_source_file}"
 
 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 \
+    bonnie++ \
     wget \
     expect \
     curl \
@@ -70,7 +80,12 @@ apt-get update && apt-get install -y \
     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
@@ -80,13 +95,28 @@ apt-get -y autoremove && apt-get clean
 
 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
-easy_install -U pip
+easy_install -U pip==9.0.1
 pip install -r requirements.txt
 pip install -e .
 
-/bin/bash "$(pwd)/api/api-prepare.sh"
+/bin/bash "${PWD}/docker/uwsgi.sh"
+/bin/bash "${PWD}/docker/nginx.sh"
+cd "${PWD}/gui" && /bin/bash gui.sh
+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
-uwsgi -i /etc/yardstick/yardstick.ini
+uwsgi -i /etc/yardstick/yardstick.ini
\ No newline at end of file