diff options
author | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-11-21 00:46:35 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-11-21 00:46:35 +0000 |
commit | 174b299271189496bae4c4d6727ea26a7a098756 (patch) | |
tree | b063e18c795988e38e1eb4afa74d4cbf9524f057 /utils/test/reporting/docker | |
parent | fd65ec9e84ae025e6b903c403514405ba0bb0a61 (diff) | |
parent | f11f26d23dabde24b0bcd67ac81b094aa89eb6c9 (diff) |
Merge "Remove 'utils/test' Directory and update INFO"
Diffstat (limited to 'utils/test/reporting/docker')
-rw-r--r-- | utils/test/reporting/docker/Dockerfile | 59 | ||||
-rw-r--r-- | utils/test/reporting/docker/nginx.conf | 24 | ||||
-rwxr-xr-x | utils/test/reporting/docker/reporting.sh | 77 | ||||
-rw-r--r-- | utils/test/reporting/docker/requirements.pip | 15 | ||||
-rw-r--r-- | utils/test/reporting/docker/supervisor.conf | 19 | ||||
-rwxr-xr-x | utils/test/reporting/docker/web_server.sh | 14 |
6 files changed, 0 insertions, 208 deletions
diff --git a/utils/test/reporting/docker/Dockerfile b/utils/test/reporting/docker/Dockerfile deleted file mode 100644 index 07440ad29..000000000 --- a/utils/test/reporting/docker/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -######################################## -# Docker container for OPNFV-REPORTING -######################################## -# Purpose: run opnfv-reporting to provide consistent Testing reporting -# -# Maintained by Morgan Richomme -# Build: -# $ docker build -t opnfv/testreporting:tag . -## -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# - -FROM nginx:stable - -MAINTAINER Morgan Richomme <morgan.richomme@orange.com> -LABEL version="1.0" description="OPNFV Test Reporting Docker container" - -ARG BRANCH=master - -ENV HOME /home/opnfv -ENV working_dir ${HOME}/releng/utils/test/reporting -ENV CONFIG_REPORTING_YAML ${working_dir}/reporting/reporting.yaml - -WORKDIR ${HOME} -# Packaged dependencies -RUN apt-get update && apt-get install -y \ -build-essential \ -ssh \ -curl \ -gnupg \ -python-pip \ -python-dev \ -python-setuptools \ -git-core \ -supervisor \ ---no-install-recommends - -RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0 - -RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng /home/opnfv/releng -RUN pip install -r ${working_dir}/requirements.txt - -RUN sh -c 'curl -sL https://deb.nodesource.com/setup_8.x | bash -' \ - && apt-get install -y nodejs \ - && npm install -g bower \ - && npm install -g grunt \ - && npm install -g grunt-cli - -WORKDIR ${working_dir} -RUN python setup.py install -RUN docker/reporting.sh -RUN docker/web_server.sh - -expose 8000 - -CMD ["/usr/bin/supervisord"] diff --git a/utils/test/reporting/docker/nginx.conf b/utils/test/reporting/docker/nginx.conf deleted file mode 100644 index 66bd7e497..000000000 --- a/utils/test/reporting/docker/nginx.conf +++ /dev/null @@ -1,24 +0,0 @@ -upstream backends { - server localhost:8001; - server localhost:8002; - server localhost:8003; - server localhost:8004; -} - - -server { - listen 8000; - server_name localhost; - - location / { - alias /home/opnfv/releng/utils/test/reporting/pages/dist/; - } - - location /api/ { - proxy_pass http://backends/; - } - - location /display/ { - alias /home/opnfv/releng/utils/test/reporting/display/; - } -} diff --git a/utils/test/reporting/docker/reporting.sh b/utils/test/reporting/docker/reporting.sh deleted file mode 100755 index 2cb438d00..000000000 --- a/utils/test/reporting/docker/reporting.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -export PYTHONPATH="${PYTHONPATH}:./reporting" -export CONFIG_REPORTING_YAML=./reporting/reporting.yaml - -declare -a versions=(euphrates danube master) -declare -a projects=(functest storperf yardstick qtip vsperf bottlenecks) - -project=$1 -reporting_type=$2 - -# create Directories if needed -for i in "${versions[@]}" -do - for j in "${projects[@]}" - do - mkdir -p display/$i/$j - done -done - -# copy images, js, css, 3rd_party -cp -Rf 3rd_party display -cp -Rf css display -cp -Rf html/* display -cp -Rf img display -cp -Rf js display - -# if nothing is precised run all the reporting generation -# projet | option -# $1 | $2 -# functest | status, vims, tempest -# yardstick | status -# storperf | status -# qtip | status -# vsperf | status - -function report_project() -{ - project=$1 - dir=$2 - type=$3 - echo "********************************" - echo " $project reporting " - echo "********************************" - python ./reporting/$dir/reporting-$type.py - if [ $? ]; then - echo "$project reporting $type...OK" - else - echo "$project reporting $type...KO" - fi -} - -if [ -z "$1" ]; then - echo "********************************" - echo " * Static status reporting *" - echo "********************************" - for i in "${projects[@]}" - do - report_project $i $i "status" - sleep 5 - done - - echo "Functest reporting vIMS..." - report_project "functest" "functest" "vims" - echo "reporting vIMS...OK" - sleep 5 - echo "Functest reporting Tempest..." - report_project "functest" "functest" "tempest" - echo "reporting Tempest...OK" - sleep 5 - -else - if [ -z "$2" ]; then - reporting_type="status" - fi - report_project $project $project $reporting_type -fi diff --git a/utils/test/reporting/docker/requirements.pip b/utils/test/reporting/docker/requirements.pip deleted file mode 100644 index aeee3ba96..000000000 --- a/utils/test/reporting/docker/requirements.pip +++ /dev/null @@ -1,15 +0,0 @@ -# -# -# author: Morgan Richomme (morgan.richomme@orange.com) -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -# -pdfkit==0.5.0 -PyYAML==3.11 -simplejson==3.8.1 -jinja2==2.8 -tornado==4.4.2 -requests==2.12.5 diff --git a/utils/test/reporting/docker/supervisor.conf b/utils/test/reporting/docker/supervisor.conf deleted file mode 100644 index 49310d430..000000000 --- a/utils/test/reporting/docker/supervisor.conf +++ /dev/null @@ -1,19 +0,0 @@ -[supervisord] -nodaemon = true - -[program:tornado] -user = root -directory = /home/opnfv/releng/utils/test/reporting/api -command = python server.py --port=800%(process_num)d -process_name=%(program_name)s%(process_num)d -numprocs=4 -numprocs_start=1 - -[program:nginx] -user = root -command = service nginx restart - -[program:configuration] -user = root -directory = /home/opnfv/releng/utils/test/reporting/pages -command = bash config.sh diff --git a/utils/test/reporting/docker/web_server.sh b/utils/test/reporting/docker/web_server.sh deleted file mode 100755 index 0dd8df73d..000000000 --- a/utils/test/reporting/docker/web_server.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -cp -r display /usr/share/nginx/html - - -# nginx config -cp /home/opnfv/releng/utils/test/reporting/docker/nginx.conf /etc/nginx/conf.d/ -echo "daemon off;" >> /etc/nginx/nginx.conf - -# supervisor config -cp /home/opnfv/releng/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/ - -# Manage Angular front end -cd pages && /bin/bash angular.sh - |