Revert "Update branches for stable/rocky"

This reverts commit e5cac49b04.

Change-Id: Ieceb5030a6c21378adcb9bf9c51cd862e0b0d01a
This commit is contained in:
Jens Harbott (frickler) 2018-08-27 13:23:18 +00:00
parent e5cac49b04
commit 57bc01b320
2 changed files with 13 additions and 1 deletions

View File

@ -15,7 +15,7 @@ source $RC_DIR/functions
# Set the target branch. This is used so that stable branching # Set the target branch. This is used so that stable branching
# does not need to update each repo below. # 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. # Cycle trailing projects need to branch later than the others.
TRAILING_TARGET_BRANCH=master TRAILING_TARGET_BRANCH=master

View File

@ -95,7 +95,19 @@ function test_libs_exist {
echo "test_libs_exist PASSED" 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 set -o errexit
test_libs_exist test_libs_exist
test_branch_master
test_all_libs_upto_date test_all_libs_upto_date