Merge "Update branches for stable/rocky"

This commit is contained in:
Zuul 2018-08-27 12:25:21 +00:00 committed by Gerrit Code Review
commit b8d5e6d836
2 changed files with 1 additions and 13 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=master TARGET_BRANCH=stable/rocky
# 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,19 +95,7 @@ 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