openstack/openstack-ansible
Code Issues Proposed changes

Merge "Make sources-branch-updater checkout the SHA properly"

Browse Source
This commit is contained in:
Jenkins 2016-01-18 22:36:20 +00:00 committed by Gerrit Code Review
commit 96abeb22b6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/sources-branch-updater.sh
View File

@ -27,7 +27,7 @@ IFS=$'\n'
if echo "$@" | grep -e '-h' -e '--help';then if echo "$@" | grep -e '-h' -e '--help';then
echo " echo "
Options: Options:
-b|--branch (name of branch) -b|--branch (name of branch, eg: stable/liberty)
-s|--service-file (path to service file to parse) -s|--service-file (path to service file to parse)
" "
exit 0 exit 0
@ -85,7 +85,10 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do
rm -rf ${repo_tmp_path} rm -rf ${repo_tmp_path}
# Do a shallow clone of the repo to work with # Do a shallow clone of the repo to work with
git clone --quiet --depth=1 --origin ${branch_sha} ${repo_address} ${repo_tmp_path} git clone --quiet --depth=10 --branch ${ONLINE_BRANCH} --no-checkout --single-branch ${repo_address} ${repo_tmp_path}
pushd ${repo_tmp_path} > /dev/null
git checkout --quiet ${branch_sha}
popd > /dev/null
# Update the policy files # Update the policy files
find ${repo_tmp_path}/etc -name "policy.json" -exec \ find ${repo_tmp_path}/etc -name "policy.json" -exec \