From 7c19c4e65a6c9af994c362ee32190f6f642385ab Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Mon, 12 Jun 2023 19:15:33 +0200 Subject: [PATCH] Do not pin openstacksdk to master openstacksdk-functional-devstack job is failing, because it overrides openstacksdk's branch to master branch, in which the dependency constraints contradicts with the constraints on zed branch, thus we need to remove the branch override. Change-Id: Ic1c9cb2e04259aaf78342b4bb2161235666abb49 (cherry picked from commit f48f90bee4557851e06890c029c56a9d6545207a) (cherry picked from commit d80aa0d8572edd542f768ac3aba3affb280c4579) --- .zuul.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 1e27a101d..a42b88f87 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -32,14 +32,14 @@ # NOTE: We pull in roles from the tempest repo for stackviz processing. - zuul: opendev.org/openstack/tempest required-projects: - # These jobs will DTRT when openstacksdk triggers them, but we want to - # make sure stable branches of openstacksdk never get cloned by other - # people, since stable branches of openstacksdk are, well, not actually - # things. + # NOTE(elod.illes): originally this job runs against openstacksdk's and + # os-client-config's master branch as that is what we want to test. This + # is fine up till that point where the constraints of dependencies begin + # to contradict on master and on old stable branches. Thus we have to + # fallback to original behaviour: use the actual stable branches on old + # stable gates. - name: openstack/openstacksdk - override-branch: master - name: openstack/os-client-config - override-branch: master timeout: 9000 vars: devstack_localrc: