Use Xena constraints for bugfix/8.1

Change-Id: I3afef0bdea7b4289b55d0a04789e2e32b2bfb9e6

3 files changed, 77 insertions, 23 deletions

diff --git a/tox.ini b/tox.ini
index ede439ad..7e57ad7c 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/xena}
   -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/xena}
   -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/xena}
   -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/xena}
   -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 7bd9ee79..1d26bb7b 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/xena
+      - name: openstack/requirements
+        override-checkout: stable/xena
       - name: openstack/ironic
         override-checkout: bugfix/18.1
       - openstack/ironic-lib
@@ -149,14 +151,12 @@
 - job:
     name: metalsmith-integration-ipa-src
     parent: metalsmith-integration-glance-localboot-centos7
+    override-checkout: stable/xena
     required-projects:
-      - name: openstack/devstack
-        override-checkout: master
-      - name: openstack/metalsmith
-        override-checkout: master
-      - openstack/ironic-python-agent
-      - openstack/ironic-python-agent-builder
-      - openstack/ironic-lib
+      - name: openstack/ironic
+        override-checkout: bugfix/18.1
+      - name: openstack/ironic-python-agent
+        override-checkout: bugfix/8.1
     vars:
       devstack_localrc:
         # Don't waste time on cleaning, it's checked everywhere else
@@ -167,14 +167,12 @@
 - job:
     name: metalsmith-integration-ipa-src-uefi
     parent: metalsmith-integration-glance-localboot-centos8-uefi
+    override-checkout: stable/xena
     required-projects:
-      - name: openstack/devstack
-        override-checkout: master
-      - name: openstack/metalsmith
-        override-checkout: master
-      - openstack/ironic-python-agent
-      - openstack/ironic-python-agent-builder
-      - openstack/ironic-lib
+      - name: openstack/ironic
+        override-checkout: bugfix/18.1
+      - name: openstack/ironic-python-agent
+        override-checkout: bugfix/8.1
     vars:
       devstack_localrc:
         # Don't waste time on cleaning, it's checked everywhere else
@@ -189,3 +187,46 @@
       devstack_localrc:
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_VM_SPECS_RAM: 1024
+
+- project-template:
+    name: openstack-python3-xena-jobs-ironic-bugfix
+    description: |
+      Runs unit tests for an OpenStack Python project under the CPython
+      version 3 releases designated for testing in the Xena release.
+    check:
+      jobs:
+        - openstack-tox-pep8:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-py36:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-py38:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-py39:
+            voting:
+                false
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+    gate:
+      jobs:
+        - openstack-tox-pep8:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-py36:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-py38:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+    post:
+      jobs:
+        - publish-openstack-python-branch-tarball
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ff5161d6..c50ce87f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,13 +1,19 @@
 - project:
     templates:
-      - openstack-python3-xena-jobs
-      - openstack-cover-jobs
+      - openstack-python3-xena-jobs-ironic-bugfix
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-tox-functional
+        - openstack-tox-functional:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-cover:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
         - ipa-tox-examples
         # NOTE(iurygregory) Only run this two jobs since we are testing
         # wholedisk + partition on tempest
@@ -37,7 +43,14 @@
     gate:
       queue: ironic
       jobs:
-        - openstack-tox-functional
+        - openstack-tox-functional:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
+        - openstack-tox-cover:
+            required-projects:
+                - name: openstack/requirements
+                  override-checkout: stable/xena
         - ipa-tempest-bios-ipmi-direct-src
         - ipa-tempest-uefi-redfish-vmedia-src
         - metalsmith-integration-ipa-src