Fix ci issues
1) Drop tripleo-common constraint
The new pip dependency resolver doesn't work well with links. See pip
issue #8253. Also we should require a release of tripleo-common for CI
to function. This is similar to what we do with tripleoclient.
2) Exclude reqs and tox files from modules job temporarly, will be
fixed in next patch
Change-Id: I1363d911a39e4072a706c61d83d113db6f85f71c
Closes-Bug: #1908079
(cherry picked from commit 82659a89a7
)
This commit is contained in:
parent
4f2f2ec200
commit
5ea47ddef9
|
@ -1,4 +1,4 @@
|
|||
ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0
|
||||
metalsmith>=1.2.0 # Apache-2.0
|
||||
importlib-metadata<2.0.0
|
||||
importlib-metadata
|
||||
jsonschema # MIT
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
-e git+https://github.com/openstack/tripleo-common@master#egg=tripleo-common
|
|
@ -1,7 +1,7 @@
|
|||
# this is required for the molecule jobs
|
||||
ansi2html
|
||||
# https://github.com/sqlalchemy/dogpile.cache/issues/178 (openstacksdk)
|
||||
dogpile.cache>=0.6.5,<0.9.1 # MIT
|
||||
dogpile.cache>=0.6.5,!=0.9.1 # MIT
|
||||
openstacksdk
|
||||
pytest
|
||||
pytest-cov
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
pbr>=1.6
|
||||
tripleo-common>=11.3.1 # Apache-2.0
|
||||
tripleo-common # Apache-2.0
|
||||
python-glanceclient>=2.8.0 # Apache-2.0
|
||||
python-heatclient # Apache-2.0
|
||||
python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0,>=2.3.0,<4.0.0;python_version=='2.7' # Apache-2.0
|
||||
|
|
11
tox.ini
11
tox.ini
|
@ -5,7 +5,7 @@ skipdist = True
|
|||
|
||||
[testenv]
|
||||
usedevelop = True
|
||||
install_command = python3 -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria} -c{toxinidir}/constraints.txt {opts} {packages}
|
||||
install_command = python3 -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria} {opts} {packages}
|
||||
passenv = *
|
||||
setenv =
|
||||
ANSIBLE_ACTION_PLUGINS={toxinidir}/tripleo_ansible/roles.galaxy/config_template/action:{toxinidir}/tripleo_ansible/ansible_plugins/action
|
||||
|
@ -49,8 +49,8 @@ sitepackages = False
|
|||
setenv =
|
||||
UPPER_CONSTRAINTS_FILE=file:///dev/null
|
||||
deps =
|
||||
pre-commit>=2.7.1
|
||||
virtualenv>=20.0.31
|
||||
pre-commit
|
||||
virtualenv
|
||||
-r {toxinidir}/ansible-requirements.txt
|
||||
commands =
|
||||
pip check
|
||||
|
@ -70,11 +70,6 @@ basepython = python3
|
|||
deps =
|
||||
-r {toxinidir}/doc/requirements.txt
|
||||
commands=
|
||||
# NOTE(cloudnull): This will ensure we always have the latest version of
|
||||
# tripleo-common installed, which is required for documentation
|
||||
# to build when running with in development modules which use
|
||||
# tripleo-common as a library.
|
||||
pip install tripleo-common -c{toxinidir}/constraints.txt --force --upgrade
|
||||
doc8 doc
|
||||
sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T
|
||||
|
||||
|
|
|
@ -6,7 +6,9 @@
|
|||
- openstack-python3-victoria-jobs
|
||||
check:
|
||||
jobs:
|
||||
- tripleo-ci-centos-8-content-provider
|
||||
- tripleo-ci-centos-8-content-provider:
|
||||
irrelevant-files:
|
||||
- ^tox.ini$
|
||||
- openstack-tox-linters: &tripleo-linters
|
||||
nodeset: centos-8
|
||||
- openstack-tox-docs: &tripleo-docs
|
||||
|
|
|
@ -200,8 +200,6 @@
|
|||
- job:
|
||||
files:
|
||||
- ^tripleo_ansible/ansible_plugins/.*$
|
||||
- ^tox.ini
|
||||
- ^molecule-requirements.txt
|
||||
name: tripleo-ansible-centos-8-molecule-tripleo-modules
|
||||
parent: tripleo-ansible-centos-8-base
|
||||
- job:
|
||||
|
|
Loading…
Reference in New Issue