Revert "Update branches for stable/rocky"
This reverts commit e5cac49b04084407432b60c5670c25961bd7302a.
Change-Id: Ieceb5030a6c21378adcb9bf9c51cd862e0b0d01a
diff --git a/stackrc b/stackrc
index 2c464bd..2088bf4 100644
--- a/stackrc
+++ b/stackrc
@@ -15,7 +15,7 @@
# 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
diff --git a/tests/test_libs_from_pypi.sh b/tests/test_libs_from_pypi.sh
index da2d970..c3b4457 100755
--- a/tests/test_libs_from_pypi.sh
+++ b/tests/test_libs_from_pypi.sh
@@ -95,7 +95,19 @@
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