Merge "Reporting docker deployment improvement"

diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 7036f20..1c1e8e1 100644 (file)
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -18,7 +18,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
 - job-template:
     name: 'functest-verify-{stream}'

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 59c5856..50859c4 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -226,7 +226,7 @@
             default: 'daisy-baremetal'
         - string:
             name: INSTALLER_IP
-            default: '10.20.11.2'
+            default: '10.20.7.3'
             description: 'IP of the installer'
         - string:
             name: GIT_BASE

diff --git a/jjb/releng/automate.yml b/jjb/releng/automate.yml
index 9eb281d..4bea703 100644 (file)
--- a/jjb/releng/automate.yml
+++ b/jjb/releng/automate.yml
@@ -247,7 +247,7 @@
     name: 'testapi-automate-docker-deploy-macro'
     builders:
         - shell: |
-            bash ./jjb/releng/docker-deploy.sh 'sudo docker run -dti -p 8082:8000 -e mongodb_url=mongodb://172.17.0.1:27017 -e swagger_url=http://testresults.opnfv.org/test opnfv/testapi' "http://testresults.opnfv.org/test/swagger/APIs"
+            bash ./jjb/releng/docker-deploy.sh 'sudo docker run -dti -p 8082:8000 -e mongodb_url=mongodb://172.17.0.1:27017 -e base_url=http://testresults.opnfv.org/test opnfv/testapi' "http://testresults.opnfv.org/test/swagger/APIs"
 - builder:
     name: 'reporting-automate-docker-deploy-macro'
     builders:

diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/config.json b/utils/test/testapi/3rd_party/static/testapi-ui/config.json
index 9fdd85f..5d48c7b 100644 (file)
--- a/utils/test/testapi/3rd_party/static/testapi-ui/config.json
+++ b/utils/test/testapi/3rd_party/static/testapi-ui/config.json
@@ -1 +1 @@
-{"testapiApiUrl": "http://testresults.opnfv.org/test/api/v1"}
+{"testapiApiUrl": "http://localhost:8000/api/v1"}

diff --git a/utils/test/testapi/deployment/deploy.py b/utils/test/testapi/deployment/deploy.py
index 748bd34..6433fa6 100644 (file)
--- a/utils/test/testapi/deployment/deploy.py
+++ b/utils/test/testapi/deployment/deploy.py
@@ -8,10 +8,10 @@ docker_compose_yml = './docker-compose.yml'
 docker_compose_template = './docker-compose.yml.template'
 
 
-def render_docker_compose(port, swagger_url):
+def render_docker_compose(port, base_url):
     vars = {
         "expose_port": port,
-        "swagger_url": swagger_url,
+        "base_url": base_url,
     }
     template = env.get_template(docker_compose_template)
     yml = template.render(vars=vars)
@@ -22,7 +22,7 @@ def render_docker_compose(port, swagger_url):
 
 
 def main(args):
-    render_docker_compose(args.expose_port, args.swagger_url)
+    render_docker_compose(args.expose_port, args.base_url)
     os.system('docker-compose -f {} up -d'.format(docker_compose_yml))
 
 
@@ -33,8 +33,8 @@ if __name__ == '__main__':
                         required=False,
                         default=8000,
                         help='testapi exposed port')
-    parser.add_argument('-su', '--swagger-url',
+    parser.add_argument('-l', '--base-url',
                         type=str,
                         required=True,
-                        help='testapi exposed swagger-url')
+                        help='testapi exposed base-url')
     main(parser.parse_args())

diff --git a/utils/test/testapi/deployment/docker-compose.yml.template b/utils/test/testapi/deployment/docker-compose.yml.template
index 5b131f7..cd68404 100644 (file)
--- a/utils/test/testapi/deployment/docker-compose.yml.template
+++ b/utils/test/testapi/deployment/docker-compose.yml.template
@@ -8,7 +8,7 @@ services:
     container_name: opnfv-testapi
     environment:
       - mongodb_url=mongodb://mongo:27017/
-      - swagger_url={{ vars.swagger_url }}
+      - base_url={{ vars.base_url }}
     ports:
       - "{{ vars.expose_port }}:8000"
     links:

diff --git a/utils/test/testapi/docker/Dockerfile b/utils/test/testapi/docker/Dockerfile
index e031e19..5311f35 100644 (file)
--- a/utils/test/testapi/docker/Dockerfile
+++ b/utils/test/testapi/docker/Dockerfile
@@ -9,7 +9,7 @@
 #
 # Execution:
 #    $ docker run -dti -p 8001:8000 \
-#      -e "swagger_url=http://10.63.243.17:8001" \
+#      -e "base_url=http://10.63.243.17:8001" \
 #      -e "mongodb_url=mongodb://10.63.243.17:27017/" \
 #      opnfv/testapi:tag
 #

diff --git a/utils/test/testapi/docker/prepare-env.sh b/utils/test/testapi/docker/prepare-env.sh
index 9f07efb..4f1be7d 100755 (executable)
--- a/utils/test/testapi/docker/prepare-env.sh
+++ b/utils/test/testapi/docker/prepare-env.sh
@@ -6,6 +6,10 @@ if [ "$mongodb_url" != "" ]; then
     sudo crudini --set --existing $FILE mongo url $mongodb_url
 fi
 
-if [ "$swagger_url" != "" ]; then
-    sudo crudini --set --existing $FILE swagger base_url $swagger_url
+if [ "$base_url" != "" ]; then
+    sudo crudini --set --existing $FILE api url $base_url/api/v1
+    sudo crudini --set --existing $FILE swagger base_url $base_url
+    sudo crudini --set --existing $FILE ui url $base_url
+    sudo echo "{\"testapiApiUrl\": \"$base_url/api/v1\"}" > \
+        /usr/local/lib/python2.7/dist-packages/opnfv_testapi/static/testapi-ui/config.json
 fi

diff --git a/utils/test/testapi/etc/config.ini b/utils/test/testapi/etc/config.ini
index dad59d2..9ae2520 100644 (file)
--- a/utils/test/testapi/etc/config.ini
+++ b/utils/test/testapi/etc/config.ini
@@ -8,7 +8,7 @@ dbname = test_results_collection
 
 [api]
 # Listening port
-url = http://testresults.opnfv.org/test/api/v1
+url = http://localhost:8000/api/v1
 port = 8000
 
 # Number of results for one page (integer value)
@@ -22,7 +22,7 @@ authenticate = False
 base_url = http://localhost:8000
 
 [ui]
-url = http://testresults.opnfv.org/test
+url = http://localhost:8000
 
 [osid]