misc: adapt to tox 4 and simplify Jenkinsfile (#72175)
This commit is contained in:
parent
4240f989ae
commit
210f6bdf01
|
@ -5,6 +5,7 @@ pipeline {
|
||||||
options { disableConcurrentBuilds() }
|
options { disableConcurrentBuilds() }
|
||||||
environment {
|
environment {
|
||||||
TMPDIR = "/tmp/${JOB_NAME.take(32)}-${BUILD_NUMBER}"
|
TMPDIR = "/tmp/${JOB_NAME.take(32)}-${BUILD_NUMBER}"
|
||||||
|
TOXARGS = "${currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause') ? " " : "--verbose -m jenkins"}"
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage('Unit Tests') {
|
stage('Unit Tests') {
|
||||||
|
@ -12,22 +13,9 @@ pipeline {
|
||||||
sh "mkdir -p ${env.TMPDIR}"
|
sh "mkdir -p ${env.TMPDIR}"
|
||||||
sh """
|
sh """
|
||||||
python3 -m venv ${env.TMPDIR}/venv/
|
python3 -m venv ${env.TMPDIR}/venv/
|
||||||
${env.TMPDIR}/venv/bin/pip install "tox<4"
|
${env.TMPDIR}/venv/bin/pip install "tox"
|
||||||
NUMPROCESSES=6 \
|
NUMPROCESSES=6 \
|
||||||
PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv"""
|
PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox run --recreate ${env.TOXARGS}"""
|
||||||
script {
|
|
||||||
if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause')) {
|
|
||||||
sh """
|
|
||||||
NUMPROCESSES=6 \
|
|
||||||
PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -rv"""
|
|
||||||
if (env.JOB_NAME == 'authentic' && env.GIT_BRANCH == 'origin/main') {
|
|
||||||
sh """
|
|
||||||
NUMPROCESSES=6 PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -v -e py3-bullseye -- tests/api"""
|
|
||||||
sh """
|
|
||||||
NUMPROCESSES=6 PGPORT=`python3 -c 'import struct; import socket; s=socket.socket(); s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 1, 0)); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'` pg_virtualenv -o fsync=off ${env.TMPDIR}/venv/bin/tox -v -e py3-stable-backports"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
|
|
23
tox.ini
23
tox.ini
|
@ -6,19 +6,16 @@
|
||||||
[tox]
|
[tox]
|
||||||
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/
|
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/
|
||||||
envlist =
|
envlist =
|
||||||
|
update-locales
|
||||||
py3
|
py3
|
||||||
py3-buster
|
py3-buster
|
||||||
py3-bullseye
|
py3-bullseye
|
||||||
py3-stable-backports
|
py3-stable-backports
|
||||||
code-style
|
|
||||||
|
|
||||||
[tox:jenkins]
|
|
||||||
envlist =
|
|
||||||
update-locales
|
|
||||||
py3-bullseye
|
|
||||||
check-migrations
|
check-migrations
|
||||||
code-style
|
code-style
|
||||||
pylint
|
pylint
|
||||||
|
labels =
|
||||||
|
jenkins = update-locales,py3-bullseye,check-migrations,code-style,pylint
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv =
|
setenv =
|
||||||
|
@ -99,6 +96,8 @@ deps =
|
||||||
bullseye: jwcrypto<0.9
|
bullseye: jwcrypto<0.9
|
||||||
stable-backports: jwcrypto<0.9
|
stable-backports: jwcrypto<0.9
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
|
allowlist_externals =
|
||||||
|
./getlasso3.sh
|
||||||
commands =
|
commands =
|
||||||
./getlasso3.sh
|
./getlasso3.sh
|
||||||
py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}
|
py.test {env:PYTESTOPTIONS:} {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {env:JUNIT:} {env:SW:} {posargs:{env:TESTS} --numprocesses {env:NUMPROCESSES:1} --random-group}
|
||||||
|
@ -111,6 +110,9 @@ setenv =
|
||||||
SETUPTOOLS_USE_DISTUTILS=stdlib
|
SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||||
deps =
|
deps =
|
||||||
psycopg2-binary<2.9
|
psycopg2-binary<2.9
|
||||||
|
allowlist_externals =
|
||||||
|
./getlasso3.sh
|
||||||
|
./check-migrations.sh
|
||||||
commands =
|
commands =
|
||||||
./getlasso3.sh
|
./getlasso3.sh
|
||||||
./check-migrations.sh
|
./check-migrations.sh
|
||||||
|
@ -134,6 +136,9 @@ deps =
|
||||||
uwsgidecorators
|
uwsgidecorators
|
||||||
pyquery
|
pyquery
|
||||||
numpy
|
numpy
|
||||||
|
allowlist_externals =
|
||||||
|
./getlasso3.sh
|
||||||
|
./pylint.sh
|
||||||
commands =
|
commands =
|
||||||
./getlasso3.sh
|
./getlasso3.sh
|
||||||
./pylint.sh {posargs:tests/ src/}
|
./pylint.sh {posargs:tests/ src/}
|
||||||
|
@ -148,6 +153,9 @@ deps =
|
||||||
django-debug-toolbar
|
django-debug-toolbar
|
||||||
ipython
|
ipython
|
||||||
ipdb
|
ipdb
|
||||||
|
allowlist_externals =
|
||||||
|
./getlasso3.sh
|
||||||
|
./manage.py
|
||||||
commands =
|
commands =
|
||||||
./getlasso3.sh
|
./getlasso3.sh
|
||||||
./manage.py {posargs:--help}
|
./manage.py {posargs:--help}
|
||||||
|
@ -159,6 +167,9 @@ setenv =
|
||||||
DJANGO_SETTINGS_MODULE=authentic2.settings
|
DJANGO_SETTINGS_MODULE=authentic2.settings
|
||||||
deps =
|
deps =
|
||||||
psycopg2-binary<2.9
|
psycopg2-binary<2.9
|
||||||
|
allowlist_externals =
|
||||||
|
./getlasso3.sh
|
||||||
|
./manage.py
|
||||||
commands =
|
commands =
|
||||||
./getlasso3.sh
|
./getlasso3.sh
|
||||||
./manage.py makemessages -l fr -i tests
|
./manage.py makemessages -l fr -i tests
|
||||||
|
|
Loading…
Reference in New Issue