diff --git a/Jenkinsfile b/Jenkinsfile index 8a4f6511..dcc0bbd0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,10 +6,14 @@ pipeline { disableConcurrentBuilds() timeout(time: 30, unit: 'MINUTES') } + environment { + max = 100000 + RAND_TEST = "${Math.abs(new Random().nextInt(max+1))}" + } stages { stage('Unit Tests') { steps { - sh 'NUMPROCESSES=6 tox -rv ' + sh "NUMPROCESSES=6 RAND_TEST=${env.RAND_TEST} tox -rv" } post { always { diff --git a/tests/settings.py b/tests/settings.py index ec546d35..6ae60faa 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -65,7 +65,7 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'TEST': { - 'NAME': ('passerelle-test-%s' % os.environ.get("BRANCH_NAME", "").replace('/', '-'))[:58], + 'NAME': ('passerelle-test-%s' % os.environ.get("RAND_TEST", "")), }, } } diff --git a/tox.ini b/tox.ini index 33d96511..8aeef58a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/{env:BRANCH_NAME:} +toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/{env:RAND_TEST:} envlist = py3-django32-xmlschema14-codestyle-coverage,py3-django22-xmlschema10,pylint [testenv] @@ -7,7 +7,7 @@ usedevelop = True setenv = DJANGO_SETTINGS_MODULE=passerelle.settings PASSERELLE_SETTINGS_FILE=tests/settings.py - BRANCH_NAME={env:BRANCH_NAME:} + RAND_TEST={env:RAND_TEST:} WCSCTL=wcs/wcsctl.py SETUPTOOLS_USE_DISTUTILS=stdlib NUMPROCESSES={env:NUMPROCESSES:1} @@ -69,7 +69,6 @@ filterwarnings = default setenv = DJANGO_SETTINGS_MODULE=passerelle.settings PASSERELLE_SETTINGS_FILE=tests/settings.py - BRANCH_NAME={env:BRANCH_NAME:} SETUPTOOLS_USE_DISTUTILS=stdlib NUMPROCESSES={env:NUMPROCESSES:6} deps =