Skip to content

Commit

Permalink
fix: use Jenkins python3.8 agent
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnacioHeredia authored and alvarolopez committed Sep 27, 2023
1 parent b8f4e04 commit 4a26593
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 48 deletions.
32 changes: 0 additions & 32 deletions Dockerfile.CI

This file was deleted.

4 changes: 1 addition & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

pipeline {
agent {
dockerfile {
filename 'Dockerfile.CI'
}
label 'python3.8'
}

environment {
Expand Down
31 changes: 18 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
min_version = 4.3.3
envlist =
envlist =
py3{8, 9, 10}
flake8
black
Expand All @@ -23,6 +23,11 @@ python = python3.11
skip_install = true
package = deepaas

[jenkins]
python = python3.8
skip_install = true
package = deepaas

[pytest]
addopts = -p no:warnings

Expand Down Expand Up @@ -68,10 +73,10 @@ basepython = python3.12

[flake8]
# Black default line length is 88
max-line-length = 88
max-line-length = 88
show-source = True
builtins = _
exclude =
exclude =
.venv
.git
.tox
Expand All @@ -82,8 +87,8 @@ exclude =
build

[testenv:flake8]
basepython = {[base]python}
skip_install = {[base]skip_install}
basepython = {[jenkins]python}
skip_install = {[jenkins]skip_install}
deps =
flake8>=4.0,<4.1
flake8-bugbear>=22.3,<22.4
Expand Down Expand Up @@ -112,7 +117,7 @@ commands = bandit -r {[base]package} -x tests -s B110,B410
basepython = {[base]python}
deps = {[testenv:bandit]deps}
skip_install = {[base]skip_install}
commands =
commands =
- mkdir /tmp/bandit
- bandit -r {[base]package} -x tests -s B110,B410 -f html -o /tmp/bandit/index.html

Expand All @@ -128,21 +133,21 @@ commands = oslo-config-generator --config-file=etc/{[base]package}-config-genera

[testenv:docs]
basepython = {[base]python}
deps =
deps =
-r {toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build
python setup.py build_sphinx

[testenv:mypy]
description = Static type checks
[testenv:mypy]
description = Static type checks
basepython = {[base]python}
deps =
deps =
mypy
commands =
commands =
mypy --config-file mypy.ini -p {[base]package}

[testenv:pip-missing-reqs]
basepython = {[base]python}
basepython = {[jenkins]python}
deps = pip_check_reqs
commands=pip-missing-reqs -d --ignore-file={[base]package}/tests/* {[base]package}
commands=pip-missing-reqs -d --ignore-file={[jenkins]package}/tests/* {[jenkins]package}

0 comments on commit 4a26593

Please sign in to comment.