summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml8
-rw-r--r--tox.ini27
2 files changed, 19 insertions, 16 deletions
diff --git a/pom.xml b/pom.xml
index 5b0b93f..f5a2a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.openecomp.vvp</groupId>
- <artifactId>vvp-engagementmgr</artifactId>
+ <groupId>org.openecomp.vvp.engagementmgr</groupId>
+ <artifactId>engagementmgr</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>vvp-engagementmgr</name>
@@ -47,7 +47,7 @@
<registry>nexus3.onap.org:10003</registry>
<images>
<image>
- <name>openecomp/vvp-engagementmgr</name>
+ <name>openecomp/vvp/engagementmgr</name>
<alias>vvp-engagementmgr</alias>
<build>
<cleanup>true</cleanup>
@@ -88,7 +88,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>openecomp/vvp-engagementmgr</image>
+ <image>openecomp/vvp/engagementmgr</image>
</configuration>
</execution>
</executions>
diff --git a/tox.ini b/tox.ini
index a88fc60..b3fb5aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,14 @@
[tox]
-envlist = django1-10-6, style
+envlist = py36
+; py36-django1-10-6 ,style
skipsdist = True
[testenv]
-commands = django-admin.py test
-setenv =
+changedir = {toxinidir}/django
+envlogdir = {toxinidir}/django/logs
+setenv =
DJANGO_SETTINGS_MODULE=vvp.settings.tox_settings
- PYTHONPATH={toxinidir}
+ PYTHONPATH={toxinidir}/django
SECRET_KEY=6mo22&_gtjf#wktqf1#ve^7=w6kx)uq0u*4ksk^aq8lte&)yul
ENVIRONMENT=development
PROGRAM_NAME_URL_PREFIX=vvp
@@ -31,19 +33,20 @@ setenv =
AWS_SECRET_ACCESS_KEY=TKoiwxziUWG9cTYUknUkFGmmyuQ27nP2lCiutEsD
STATIC_ROOT=/app/htdocs
-[base]
+[testenv:py36-django1-10-6]
+basepython = python3.6
deps = -r{toxinidir}/django/requirements.txt
-
-[testenv:django1-10-6]
-deps =
- {[base]deps}
+commands = python --version
+ django-admin.py test
[testenv:style]
+basepython = python3
+deps = flake8
commands = flake8
-[testenv:py3]
-basepython=python3
-
[flake8]
show-source = True
exclude=venv-tox,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+
+[testenv:py36]
+commands = python --version