summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2018-01-11 05:45:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-11 05:45:02 +0000
commite4f902c091e47a2958d3c39d284a77875541a623 (patch)
treedb025e79aa7166f710c36a8ec4ac0094578209b1
parent530347952846f2502f95f7fa1c999a1d3d69e581 (diff)
parentf0fdac6e33287030c70b223301f18f5bf9060de3 (diff)
Merge "reporting leveraging the new repo releng-testresults"
-rw-r--r--reporting/docker/Dockerfile4
-rw-r--r--reporting/docker/nginx.conf4
-rw-r--r--reporting/docker/supervisor.conf4
-rwxr-xr-xreporting/docker/web_server.sh4
-rw-r--r--reporting/requirements.txt2
5 files changed, 9 insertions, 9 deletions
diff --git a/reporting/docker/Dockerfile b/reporting/docker/Dockerfile
index 07440ad..630a4d8 100644
--- a/reporting/docker/Dockerfile
+++ b/reporting/docker/Dockerfile
@@ -21,7 +21,7 @@ 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 working_dir ${HOME}/releng-testresults/reporting
ENV CONFIG_REPORTING_YAML ${working_dir}/reporting/reporting.yaml
WORKDIR ${HOME}
@@ -40,7 +40,7 @@ supervisor \
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 git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng-testresults /home/opnfv/releng-testresults
RUN pip install -r ${working_dir}/requirements.txt
RUN sh -c 'curl -sL https://deb.nodesource.com/setup_8.x | bash -' \
diff --git a/reporting/docker/nginx.conf b/reporting/docker/nginx.conf
index 66bd7e4..7a41640 100644
--- a/reporting/docker/nginx.conf
+++ b/reporting/docker/nginx.conf
@@ -11,7 +11,7 @@ server {
server_name localhost;
location / {
- alias /home/opnfv/releng/utils/test/reporting/pages/dist/;
+ alias /home/opnfv/releng-testresults/reporting/pages/dist/;
}
location /api/ {
@@ -19,6 +19,6 @@ server {
}
location /display/ {
- alias /home/opnfv/releng/utils/test/reporting/display/;
+ alias /home/opnfv/releng-testresults/reporting/display/;
}
}
diff --git a/reporting/docker/supervisor.conf b/reporting/docker/supervisor.conf
index 49310d4..830749d 100644
--- a/reporting/docker/supervisor.conf
+++ b/reporting/docker/supervisor.conf
@@ -3,7 +3,7 @@ nodaemon = true
[program:tornado]
user = root
-directory = /home/opnfv/releng/utils/test/reporting/api
+directory = /home/opnfv/releng-testresults/reporting/api
command = python server.py --port=800%(process_num)d
process_name=%(program_name)s%(process_num)d
numprocs=4
@@ -15,5 +15,5 @@ command = service nginx restart
[program:configuration]
user = root
-directory = /home/opnfv/releng/utils/test/reporting/pages
+directory = /home/opnfv/releng-testresults/reporting/pages
command = bash config.sh
diff --git a/reporting/docker/web_server.sh b/reporting/docker/web_server.sh
index 0dd8df7..065c991 100755
--- a/reporting/docker/web_server.sh
+++ b/reporting/docker/web_server.sh
@@ -3,11 +3,11 @@ cp -r display /usr/share/nginx/html
# nginx config
-cp /home/opnfv/releng/utils/test/reporting/docker/nginx.conf /etc/nginx/conf.d/
+cp /home/opnfv/releng-testresults/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/
+cp /home/opnfv/releng-testresults/reporting/docker/supervisor.conf /etc/supervisor/conf.d/
# Manage Angular front end
cd pages && /bin/bash angular.sh
diff --git a/reporting/requirements.txt b/reporting/requirements.txt
index 344064d..a01d1dc 100644
--- a/reporting/requirements.txt
+++ b/reporting/requirements.txt
@@ -1,5 +1,5 @@
pdfkit>=0.6.1 # MIT
-wkhtmltopdf-pack>=0.12.3 # MIT
+wkhtmltopdf-pack==0.12.2.4 # MIT
PyYAML>=3.10.0 # MIT
simplejson>=2.2.0 # MIT
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)