From e26d481bf75d80b76c0230be17528f644d336696 Mon Sep 17 00:00:00 2001
From: Masayuki Igawa <masayuki@igawa.io>
Date: Wed, 30 Sep 2020 17:36:50 +0900
Subject: [PATCH] Update devstack branches for stable/victoria

Change-Id: I0890ba89394a5bc041bc31321e896f085af5679c
---
 stackrc                      |  2 +-
 tests/test_libs_from_pypi.sh | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/stackrc b/stackrc
index bf1ad3d85d..1b0285d192 100644
--- a/stackrc
+++ b/stackrc
@@ -15,7 +15,7 @@ source $RC_DIR/functions
 
 # Set the target branch. This is used so that stable branching
 # does not need to update each repo below.
-TARGET_BRANCH=master
+TARGET_BRANCH=stable/victoria
 
 # Cycle trailing projects need to branch later than the others.
 TRAILING_TARGET_BRANCH=master
diff --git a/tests/test_libs_from_pypi.sh b/tests/test_libs_from_pypi.sh
index ab7583d042..3a27df26ec 100755
--- a/tests/test_libs_from_pypi.sh
+++ b/tests/test_libs_from_pypi.sh
@@ -95,19 +95,7 @@ function test_libs_exist {
     echo "test_libs_exist PASSED"
 }
 
-function test_branch_master {
-    for lib in $ALL_LIBS; do
-        if [[ ${GITBRANCH[$lib]} != "master" ]]; then
-            echo "GITBRANCH for $lib not master (${GITBRANCH[$lib]})"
-            exit 1
-        fi
-    done
-
-    echo "test_branch_master PASSED"
-}
-
 set -o errexit
 
 test_libs_exist
-test_branch_master
 test_all_libs_upto_date