Use Yoga constraints for bugfix/8.3

Change-Id: I5e95fae1f2846a19c859b5d61e224ad198c1a8c5

3 files changed, 68 insertions, 13 deletions

diff --git a/tox.ini b/tox.ini
index ccbe9fa5..4c47f960 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
   LANGUAGE=en_US
   LC_ALL=en_US.utf-8
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
@@ -71,7 +71,7 @@ setenv = PYTHONHASHSEED=0
 sitepackages = False
 # NOTE(dtantsur): documentation building process requires importing IPA
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
@@ -89,7 +89,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/yoga}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
@@ -128,7 +128,7 @@ commands =
 [testenv:bandit]
 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/yoga}
   -r{toxinidir}/test-requirements.txt
 commands = bandit -r ironic_python_agent -x tests -n5 -ll -c tools/bandit.yml
 
diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 4fac9a7e..5db59a11 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -15,7 +15,9 @@
       - ^tox.ini$
     required-projects:
       - name: openstack/devstack
-        override-checkout: master
+        override-checkout: stable/yoga
+      - name: openstack/requirements
+        override-checkout: stable/yoga
       - name: openstack/ironic
         override-checkout: bugfix/19.0
       - openstack/ironic-lib
@@ -152,12 +154,16 @@
     parent: metalsmith-integration-glance-localboot-centos8-uefi
     required-projects:
       - name: openstack/devstack
-        override-checkout: master
+        override-checkout: stable/yoga
+      - name: openstack/requirements
+        override-checkout: stable/yoga
+      - name: openstack/ironic
+        override-checkout: bugfix/19.0
       - name: openstack/metalsmith
-        override-checkout: master
+        override-checkout: stable/yoga
       - openstack/ironic-python-agent
       - name: openstack/ironic-python-agent-builder
-        override-checkout: master
+        override-checkout: stable/yoga
       - openstack/ironic-lib
     vars:
       devstack_localrc:
@@ -173,3 +179,40 @@
       devstack_localrc:
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_VM_SPECS_RAM: 1024
+
+- project-template:
+    name: openstack-python3-yoga-jobs-ironic-bugfix
+    description: |
+      Runs unit tests for an OpenStack Python project under the CPython
+      version 3 releases designated for testing in the Yoga release.
+    check:
+      jobs:
+        - openstack-tox-pep8:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+        - openstack-tox-py36:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+        - openstack-tox-py39:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+    gate:
+      jobs:
+        - openstack-tox-pep8:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+        - openstack-tox-py36:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+        - openstack-tox-py39:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+    post:
+      jobs:
+        - publish-openstack-python-branch-tarball
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0983e938..566924ae 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,14 +1,19 @@
 - project:
     templates:
       - check-requirements
-      - openstack-cover-jobs
-      - openstack-lower-constraints-master-branch-jobs
-      - openstack-python3-yoga-jobs
+      - openstack-python3-yoga-jobs-ironic-bugfix
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-tox-functional
+        - openstack-tox-functional:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+        - openstack-tox-cover:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
         - ipa-tox-examples
         # NOTE(iurygregory) Only run this two jobs since we are testing
         # wholedisk + partition on tempest
@@ -36,7 +41,14 @@
     gate:
       queue: ironic
       jobs:
-        - openstack-tox-functional
+        - openstack-tox-functional:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
+        - openstack-tox-cover:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/yoga
         - ipa-tempest-bios-ipmi-direct-src
         - ipa-tempest-uefi-redfish-vmedia-src
         - metalsmith-integration-ipa-src-uefi