Merge "Switch to the master constraint in tox.ini"

This commit is contained in:
Zuul 2024-09-24 07:16:47 +00:00 committed by Gerrit Code Review
commit f4a3be7e35
2 changed files with 9 additions and 9 deletions

10
tox.ini
View File

@ -9,7 +9,7 @@ setenv =
OS_TEST_PATH=./tempest/test_discover OS_TEST_PATH=./tempest/test_discover
OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200} OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:1200}
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
[testenv] [testenv]
@ -40,7 +40,7 @@ usedevelop = True
allowlist_externals = allowlist_externals =
find find
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
@ -337,7 +337,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -351,7 +351,7 @@ commands = {posargs}
[testenv:docs] [testenv:docs]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
sphinx-apidoc -f -o doc/source/tests/compute tempest/api/compute sphinx-apidoc -f -o doc/source/tests/compute tempest/api/compute
@ -440,7 +440,7 @@ paths =
[testenv:releasenotes] [testenv:releasenotes]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
rm -rf releasenotes/build rm -rf releasenotes/build

View File

@ -119,8 +119,8 @@
- tempest-full-test-account-py3: - tempest-full-test-account-py3:
voting: false voting: false
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
#- ironic-tempest-bios-ipmi-direct-tinyipa: - ironic-tempest-bios-ipmi-direct-tinyipa:
# irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
- openstack-tox-bashate: - openstack-tox-bashate:
irrelevant-files: *tempest-irrelevant-files-2 irrelevant-files: *tempest-irrelevant-files-2
gate: gate:
@ -152,8 +152,8 @@
# irrelevant-files: *tempest-irrelevant-files # irrelevant-files: *tempest-irrelevant-files
- nova-live-migration: - nova-live-migration:
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
#- ironic-tempest-bios-ipmi-direct-tinyipa: - ironic-tempest-bios-ipmi-direct-tinyipa:
# irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
experimental: experimental:
jobs: jobs:
- nova-multi-cell - nova-multi-cell