Skip to content

Commit 4c6ddf6

Browse files
portantewebbnh
authored andcommitted
Create a separate tox env for Agent Python 3.6
The requirements for the agent, client, and server are different enough that any new version requirement for the client or server code will cause the `py36` environment to fail installation. This isolates the use of Python 3.6 so that only the agent requirements are installed.
1 parent 7c95c86 commit 4c6ddf6

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

jenkins/Pipeline.gy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pipeline {
3535
stage('Agent Python3.6 Check') {
3636
steps {
3737
echo 'Verify agent side works with Python 3.6'
38-
sh 'jenkins/run tox -e py36 -- agent'
38+
sh 'jenkins/run tox -e agent-py36 -- agent'
3939
}
4040
}
4141
stage('Linting, Unit Tests, RPM builds') {

tox.ini

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ distshare = {toxworkdir}/distshare
66
envlist = py39
77

88
[testenv]
9-
description = Lints code and runs all agent and server unit/functional tests
9+
description = Runs all agent, client, and server unit/functional tests
1010
install_command = pip install --cache-dir={toxworkdir}/cache --progress-bar off --prefix={envdir} {opts} {packages}
1111
passenv =
1212
PY_COLORS
@@ -33,3 +33,10 @@ commands =
3333
bash -c "{toxinidir}/exec-tests {envdir} {posargs}"
3434
whitelist_externals =
3535
bash
36+
37+
[testenv:agent-py36]
38+
description = Runs all agent unit tests under Python 3.6
39+
basepython = python3.6
40+
deps =
41+
-r{toxinidir}/agent/requirements.txt
42+
-r{toxinidir}/agent/test-requirements.txt

0 commit comments

Comments
 (0)