From 84c6b102b88ce439730fd39015fc5bb4e8afc42d Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Wed, 8 Jun 2022 15:47:01 -0400
Subject: [PATCH] Use stable/yoga override for CI jobs

cinderlib master is still Yoga development, but when zuul runs on a
master patch, zuul.branch is 'master', and this cascades throughout
the various jobs.  It's particularly evident for requirements, but
also affects cinder and os-brick (which are installed from source);
from what I can tell, an initial install is done to gather
dependencies, and this seems to be from master by default.  So
explicitly use override-checkout for requirements, cinder, and
os-brick on all jobs.

Why are we only noticing this now?  I think it hasn't been a problem
in the past because python 3.6 has been supported from Rocky through
Yoga, and is dropped from Zed, and hence running the cinderlib Yoga
development branch against master for other projects is encountering
some serious incompatibilities.  We probably should have been using
the stable branch in cinderlib's pre-release trailing phase all
along; it just hasn't mattered until now.

Change-Id: I82e2bbf7e0380e2bffbb44d394e9751e1578afcf
---
 .zuul.yaml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 40ead77..4db19cb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -30,27 +30,40 @@
     name: cinderlib-tox-py36
     parent: openstack-tox-py36
     required-projects:
-      - openstack/os-brick
-      - openstack/cinder
+      - name: openstack/os-brick
+        override-checkout: stable/yoga
+      - name: openstack/cinder
+        override-checkout: stable/yoga
+      - name: openstack/requirements
+        override-checkout: stable/yoga
 
 - job:
     name: cinderlib-tox-py39
     parent: openstack-tox-py39
     required-projects:
-      - openstack/os-brick
-      - openstack/cinder
+      - name: openstack/os-brick
+        override-checkout: stable/yoga
+      - name: openstack/cinder
+        override-checkout: stable/yoga
+      - name: openstack/requirements
+        override-checkout: stable/yoga
 
 - job:
     name: cinderlib-functional
     parent: openstack-tox-functional-with-sudo
     required-projects:
-      - openstack/os-brick
-      - openstack/cinder
+      - name: openstack/os-brick
+        override-checkout: stable/yoga
+      - name: openstack/cinder
+        override-checkout: stable/yoga
+      - name: openstack/requirements
+        override-checkout: stable/yoga
     pre-run: playbooks/required-projects-bindeps.yaml
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
       - ^releasenotes/.*$
+
 - job:
     name: cinderlib-lvm-functional
     parent: cinderlib-functional