summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-03-03 18:04:33 +0000
committerGerrit Code Review <review@openstack.org>2023-03-03 18:04:33 +0000
commitb90ca64ce9f0d52df5067e44759f8492a02068f4 (patch)
tree834bfa0ad22fa10a1f411f3e30372da3169c58b2
parent316be3675a3358860882ba0772dcf6ffa9fef230 (diff)
parentc84c536940457f37e57378e4a8bd3e2a409bb6e5 (diff)
downloadironic-b90ca64ce9f0d52df5067e44759f8492a02068f4.tar.gz
Merge "Configure CI for bugfix/21.3" into bugfix/21.3
-rw-r--r--tox.ini10
-rw-r--r--zuul.d/ironic-jobs.yaml5
-rw-r--r--zuul.d/project.yaml8
3 files changed, 18 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 97ea9f707..8bcad7bf7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
PYTHONUNBUFFERED=1
SQLALCHEMY_WARN_20=true
deps =
- -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@@ -85,7 +85,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/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = sphinx-build -b html -W doc/source doc/build/html
@@ -102,7 +102,7 @@ commands =
# NOTE(Mahnoor): documentation building process requires importing ironic API modules
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/2023.1}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
allowlist_externals = bash
@@ -113,7 +113,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/2023.1}
-r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@@ -121,7 +121,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/2023.1}
-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 ca1757417..4aa9297cb 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -7,6 +7,11 @@
post-run: playbooks/ci-workarounds/get_extra_logging.yaml
timeout: 10800
required-projects:
+ # TODO(dtantsur): change everything to stable/2023.1
+ - name: openstack/requirements
+ override-checkout: master
+ - name: openstack/devstack
+ override-checkout: master
# TODO(TheJulia): Explicitly pull in DIB until we get a release cut.
- opendev.org/openstack/diskimage-builder
- opendev.org/openstack/ironic
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0f7ff75e1..4672e74ae 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -51,8 +51,16 @@
voting: false
- bifrost-integration-tinyipa-ubuntu-focal:
voting: false
+ required-projects:
+ # TODO(dtantsur): change to stable/2023.1
+ - name: openstack/bifrost
+ override-checkout: master
- bifrost-integration-redfish-vmedia-uefi-centos-9:
voting: false
+ required-projects:
+ # TODO(dtantsur): change to stable/2023.1
+ - name: openstack/bifrost
+ override-checkout: master
- ironic-tempest-pxe_ipmitool-postgres:
voting: false
- bifrost-benchmark-ironic: