Browse code

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

Zuul authored on 2018/08/28 03:16:24
Showing 2 changed files
... ...
@@ -15,7 +15,7 @@ source $RC_DIR/functions
15 15
 
16 16
 # Set the target branch. This is used so that stable branching
17 17
 # does not need to update each repo below.
18
-TARGET_BRANCH=stable/rocky
18
+TARGET_BRANCH=master
19 19
 
20 20
 # Cycle trailing projects need to branch later than the others.
21 21
 TRAILING_TARGET_BRANCH=master
... ...
@@ -95,7 +95,19 @@ function test_libs_exist {
95 95
     echo "test_libs_exist PASSED"
96 96
 }
97 97
 
98
+function test_branch_master {
99
+    for lib in $ALL_LIBS; do
100
+        if [[ ${GITBRANCH[$lib]} != "master" ]]; then
101
+            echo "GITBRANCH for $lib not master (${GITBRANCH[$lib]})"
102
+            exit 1
103
+        fi
104
+    done
105
+
106
+    echo "test_branch_master PASSED"
107
+}
108
+
98 109
 set -o errexit
99 110
 
100 111
 test_libs_exist
112
+test_branch_master
101 113
 test_all_libs_upto_date