From ceae5c1030d4b5149fa6d229a1172fb16f314329 Mon Sep 17 00:00:00 2001
From: Jakob Meng <code@jakobmeng.de>
Date: Mon, 25 Jul 2022 13:45:14 +0200
Subject: [PATCH] Use master branch of openstacksdk in Bifrost jobs

Bifrost downgrades openstacksdk to a release <0.99.0 [1], which is
incompatible to our master branch of the Ansible OpenStack
collection. By adding openstacksdk to Zuul variable job.required-\
projects [2], Bifrost will install openstacksdk from its master
branch, overwriting any existing (older) openstacksdk releases.

[1] https://opendev.org/openstack/bifrost/commit/03ddd026567f7b61b89d83b0e7e7cb35ed466ae6
[2] https://review.opendev.org/c/openstack/bifrost/+/849563/5/playbooks/test-bifrost.yaml

Change-Id: I46dadc70338bb45d459e8176cc26e67c20c1d4ae
---
 .zuul.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index e4904ac..88f6539 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -289,6 +289,9 @@
       - # always use master branch when collecting parent job variants, refer to git blame for rationale.
         name: openstack/bifrost
         override-checkout: master
+      - # always use master branch when collecting parent job variants
+        name: openstack/openstacksdk
+        override-checkout: master
 - job:
     name: bifrost-keystone-collections-src
     parent: bifrost-integration-tinyipa-keystone-ubuntu-focal
@@ -297,6 +300,9 @@
       - # always use master branch when collecting parent job variants, refer to git blame for rationale.
         name: openstack/bifrost
         override-checkout: master
+      - # always use master branch when collecting parent job variants
+        name: openstack/openstacksdk
+        override-checkout: master
 
 # TripleO jobs
 - job:
-- 
GitLab