Merge pull request #84 from stackhpc/upstream/yoga-2024-07-15

Synchronise yoga with upstream

Author: markgoddard

.zuul.yaml

@@ -2,13 +2,12 @@
 # for job naming conventions.
 
 - job:
-    name: nova-tox-functional-centos8-py36
-    parent: openstack-tox-functional-py36
-    nodeset: devstack-single-node-centos-8-stream
+    name: nova-tox-functional-py38
+    parent: openstack-tox-functional-py38
     description: |
       Run tox-based functional tests for the OpenStack Nova project
-      under cPython version 3.6 with Nova specific irrelevant-files list.
-      Uses tox with the ``functional-py36`` environment.
+      under cPython version 3.8 with Nova specific irrelevant-files list.
+      Uses tox with the ``functional-py38`` environment.
 
       This job also provides a parent for other projects to run the nova
       functional tests on their own changes.
@@ -22,28 +21,6 @@
       - ^doc/(source|test)/.*$
       - ^nova/locale/.*$
       - ^releasenotes/.*$
-    vars:
-      # explicitly stating the work dir makes this job reusable by other
-      # projects
-      zuul_work_dir: src/opendev.org/openstack/nova
-      bindep_profile: test py36
-    timeout: 3600
-
-- job:
-    name: nova-tox-functional-py38
-    parent: openstack-tox-functional-py38
-    description: |
-      Run tox-based functional tests for the OpenStack Nova project
-      under cPython version 3.8 with Nova specific irrelevant-files list.
-      Uses tox with the ``functional-py38`` environment.
-
-      This job also provides a parent for other projects to run the nova
-      functional tests on their own changes.
-    required-projects:
-      # including nova here makes this job reusable by other projects
-      - openstack/nova
-      - openstack/placement
-    irrelevant-files: *functional-irrelevant-files
     vars:
       # explicitly stating the work dir makes this job reusable by other
       # projects
@@ -588,9 +565,14 @@
     irrelevant-files: *nova-base-irrelevant-files
     required-projects:
       - openstack/nova
+      - name: openstack/cinder-tempest-plugin
+        override-checkout: yoga-last
     pre-run:
       - playbooks/ceph/glance-copy-policy.yaml
     vars:
+      # NOTE(elod.illes): this job is breaking with the following test case on
+      # unmaintained/yoga, so let's just exclude it to unblock the gate
+      tempest_exclude_regex: test_nova_image_snapshot_dependency
       # NOTE(danms): These tests create an empty non-raw image, which nova
       # will refuse because we set never_download_image_if_on_rbd in this job.
       # Just skip these tests for this case.
@@ -663,7 +645,6 @@
         - nova-ovs-hybrid-plug
         - nova-tox-validate-backport:
             voting: false
-        - nova-tox-functional-centos8-py36
         - nova-tox-functional-py38
         - nova-tox-functional-py39
         - tempest-integrated-compute:
@@ -708,7 +689,6 @@
       jobs:
         - nova-live-migration
         - nova-live-migration-ceph
-        - nova-tox-functional-centos8-py36
         - nova-tox-functional-py38
         - nova-tox-functional-py39
         - nova-multi-cell