From 74f8869fd9ca436071d2227a8a668463e1f414e6 Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Wed, 15 Feb 2023 16:58:46 -0800
Subject: [PATCH] Remove "feature/r1" override from manila job

This was cruft left over from the merge of "feature/r1" to
the "master" branch. Currently manila jobs are failing since
a bindep fix [1] that's present in the "master" branch aren't
present in the "feature/r1" branch.

[1] https://review.opendev.org/c/openstack/openstacksdk/+/863839

Change-Id: Iecd6434a8b3eb92180e463f984e7982ed97ad61f
---
 .zuul.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 9f6a54324..446be8113 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -355,8 +355,7 @@
       Run openstacksdk functional tests against a master devstack with manila
     required-projects:
       - openstack/manila
-      - name: openstack/openstacksdk
-        override-branch: feature/r1
+      - openstack/openstacksdk
     vars:
       devstack_localrc:
         # Set up manila with a fake driver - makes things super fast and should