Merge "Revert "Update branches for stable/rocky""

Author: Zuul

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=stable/rocky
+TARGET_BRANCH=master
 
 # Cycle trailing projects need to branch later than the others.
 TRAILING_TARGET_BRANCH=master

tests/test_libs_from_pypi.sh

@@ -95,7 +95,19 @@ 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