jenkins: do not run tests against django 1.11 anymore (#55333)
This commit is contained in:
parent
2538b73c33
commit
933aeeccf7
|
@ -5,40 +5,15 @@ pipeline {
|
|||
options { disableConcurrentBuilds() }
|
||||
stages {
|
||||
stage('Unit Tests') {
|
||||
parallel {
|
||||
stage('Unit tests django 1.11') {
|
||||
agent any
|
||||
steps {
|
||||
sh 'tox -rv -e py3-django111-codestyle-pylint-coverage'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
stash includes:'junit-py3-django111-codestyle-pylint-coverage.xml', name: 'django111'
|
||||
script {
|
||||
utils = new Utils()
|
||||
utils.publish_coverage('coverage.xml')
|
||||
utils.publish_coverage_native('index.html')
|
||||
utils.publish_pylint('pylint.out')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Unit tests django 2.2') {
|
||||
agent any
|
||||
steps {
|
||||
sh 'tox -rv -e py3-django22'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
stash includes:'junit-py3-django22.xml', name: 'django22'
|
||||
}
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'tox -rv'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
unstash 'django111'
|
||||
unstash 'django22'
|
||||
utils = new Utils()
|
||||
utils.publish_coverage('coverage.xml')
|
||||
utils.publish_coverage('coverage.xml')
|
||||
utils.publish_coverage_native('index.html')
|
||||
mergeJunitResults()
|
||||
}
|
||||
}
|
||||
|
|
3
tox.ini
3
tox.ini
|
@ -1,6 +1,6 @@
|
|||
[tox]
|
||||
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/wcs/{env:BRANCH_NAME:main}/{env:EXECUTOR_NUMBER:}
|
||||
envlist = py3-django111-codestyle-pylint-coverage, py3-django22
|
||||
envlist = py3-django22-codestyle-pylint-coverage
|
||||
|
||||
[testenv]
|
||||
sitepackages = true
|
||||
|
@ -36,7 +36,6 @@ deps =
|
|||
docutils
|
||||
langdetect
|
||||
git+https://git.entrouvert.org/debian/django-ckeditor.git
|
||||
django111: django>=1.11,<1.12
|
||||
django22: django>=2.2,<2.3
|
||||
django-ratelimit<3
|
||||
pyproj
|
||||
|
|
Loading…
Reference in New Issue