diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-14 20:04:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-14 20:04:51 +0000 |
| commit | 4b317360dfb6ec942307d23cc57df327440ae9e4 (patch) | |
| tree | cc8a509359e93552b358453a165218729b618af7 | |
| parent | 442374080d6b4ae42dbce3260fea75fd44f6d326 (diff) | |
| parent | be0ebde0107e1addff5b4bb96d038f8bb804224f (diff) | |
| download | ironic-4b317360dfb6ec942307d23cc57df327440ae9e4.tar.gz | |
Merge "Use stable/xena upper-constraints" into bugfix/18.1
| -rw-r--r-- | tox.ini | 8 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 4 |
2 files changed, 5 insertions, 7 deletions
@@ -79,7 +79,7 @@ commands = oslo_debug_helper -t ironic/tests/unit {posargs} [testenv:docs] # NOTE(dtantsur): documentation building process requires importing ironic deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html -W doc/source doc/build/html @@ -95,7 +95,7 @@ commands = [testenv:api-ref] usedevelop = False deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/doc/requirements.txt allowlist_externals = bash commands = @@ -105,7 +105,7 @@ commands = [testenv:releasenotes] usedevelop = False deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html @@ -113,7 +113,7 @@ commands = [testenv:venv] setenv = PYTHONHASHSEED=0 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index f581399a1..4ad4ec341 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -4,11 +4,10 @@ description: Base job for devstack/tempest based ironic jobs. parent: devstack-tempest nodeset: openstack-single-node-focal + override-checkout: stable/xena post-run: playbooks/ci-workarounds/get_extra_logging.yaml timeout: 10800 required-projects: - - name: opendev.org/openstack/devstack - override-checkout: master - opendev.org/openstack/ironic - name: opendev.org/openstack/ironic-python-agent override-checkout: bugfix/8.1 @@ -160,7 +159,6 @@ description: Test ironic standalone configured with redfish hardware type, ansible and direct and ansible deploy interfaces, rescue it's not enabled. - override-checkout: stable/xena required-projects: - opendev.org/openstack/sushy-tools irrelevant-files: |