summaryrefslogtreecommitdiffstats
path: root/utils/test/reporting/docker
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2016-12-24 23:08:46 +0000
committerchenjiankun <chenjiankun1@huawei.com>2016-12-30 15:38:08 +0000
commit64605f1cc7117854abb203375deee396e0d65cc1 (patch)
tree42f863658d915c45b18996be37271813385d3f33 /utils/test/reporting/docker
parent53ed9e36a13d03455fc04b3f54ed290037359f6b (diff)
Create Test Reporting landing page
JIRA: RELENG-165 In this patch, I do the follow things: 1.deploy tornado server(currently I haven't write any backend code, since the backend code depend on the testapi and I need to communicate with Serena). 2.landing page code(almostly finished. But I haven't the data, so for now, the data this page shows is a mock json. When the testapi and my backend code ready, this page will finally finished) 3.deployment: supervisor + nginx + tornado + angular usage: docker run -itd -p 8000:8000 opnfv/reporting:<tag> visit landing page: http://server_ip:8000/reporting/index.html test api: http://server_ip:8000/landing-page/filters visit old reporting page: http://server_ip:8000/display/master/yardstick/status-apex.html Change-Id: I527ab2661ce9e84b2942ebe673afbf5f2bc7878f Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'utils/test/reporting/docker')
-rw-r--r--utils/test/reporting/docker/Dockerfile7
-rw-r--r--utils/test/reporting/docker/nginx.conf24
-rwxr-xr-xutils/test/reporting/docker/reporting.sh18
-rw-r--r--utils/test/reporting/docker/requirements.pip1
-rw-r--r--utils/test/reporting/docker/supervisor.conf16
5 files changed, 65 insertions, 1 deletions
diff --git a/utils/test/reporting/docker/Dockerfile b/utils/test/reporting/docker/Dockerfile
index b5fe09894..42f019a45 100644
--- a/utils/test/reporting/docker/Dockerfile
+++ b/utils/test/reporting/docker/Dockerfile
@@ -32,6 +32,9 @@ ssh \
python-pip \
git-core \
wkhtmltopdf \
+nodejs \
+npm \
+supervisor \
--no-install-recommends
RUN pip install --upgrade pip
@@ -41,3 +44,7 @@ RUN pip install -r ${working_dir}/docker/requirements.pip
WORKDIR ${working_dir}
RUN docker/reporting.sh
+
+expose 8000
+
+CMD ["/usr/bin/supervisord"]
diff --git a/utils/test/reporting/docker/nginx.conf b/utils/test/reporting/docker/nginx.conf
new file mode 100644
index 000000000..9e2697248
--- /dev/null
+++ b/utils/test/reporting/docker/nginx.conf
@@ -0,0 +1,24 @@
+upstream backends {
+ server localhost:8001;
+ server localhost:8002;
+ server localhost:8003;
+ server localhost:8004;
+}
+
+
+server {
+ listen 8000;
+ server_name localhost;
+
+ location / {
+ proxy_pass http://backends;
+ }
+
+ location /reporting/ {
+ alias /home/opnfv/utils/test/reporting/pages/dist/;
+ }
+
+ location /display/ {
+ alias /home/opnfv/utils/test/reporting/display/;
+ }
+}
diff --git a/utils/test/reporting/docker/reporting.sh b/utils/test/reporting/docker/reporting.sh
index d6b173ceb..1bef1b811 100755
--- a/utils/test/reporting/docker/reporting.sh
+++ b/utils/test/reporting/docker/reporting.sh
@@ -61,4 +61,20 @@ else
echo "********************************"
python ./$project/reporting-$reporting_type.py
fi
-mv display /usr/share/nginx/html
+cp -r display /usr/share/nginx/html
+
+
+# nginx config
+cp /home/opnfv/utils/test/reporting/docker/nginx.conf /etc/nginx/conf.d/
+echo "daemon off;" >> /etc/nginx/nginx.conf
+
+# supervisor config
+cp /home/opnfv/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/
+
+# build pages
+cd pages
+ln -s /usr/bin/nodejs /usr/bin/node
+npm install
+npm install -g grunt bower
+bower install --allow-root
+grunt build
diff --git a/utils/test/reporting/docker/requirements.pip b/utils/test/reporting/docker/requirements.pip
index c1bf4b109..6de856e35 100644
--- a/utils/test/reporting/docker/requirements.pip
+++ b/utils/test/reporting/docker/requirements.pip
@@ -11,3 +11,4 @@ pdfkit==0.5.0
PyYAML==3.11
simplejson==3.8.1
jinja2==2.8
+tornado==4.4.2
diff --git a/utils/test/reporting/docker/supervisor.conf b/utils/test/reporting/docker/supervisor.conf
new file mode 100644
index 000000000..0c2207793
--- /dev/null
+++ b/utils/test/reporting/docker/supervisor.conf
@@ -0,0 +1,16 @@
+[supervisord]
+nodaemon = true
+
+[program:reporting_tornado]
+user = root
+directory = /home/opnfv/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
+autorestart = true
+
+[program:reporting_nginx]
+user = root
+command = service nginx restart
+autorestart = true