openstack/openstack-ansible
Code Issues Proposed changes

Merge "scripts: sources-branch-updater-lib: Always fetch SHAs when working on master"

Browse Source
This commit is contained in:
Jenkins 2017-10-04 18:46:14 +00:00 committed by Gerrit Code Review
commit fcd3ccbcc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/sources-branch-updater-lib.sh
View File

@ -229,8 +229,8 @@ update_ansible_role_requirements() {
role_name=$(sed 's/^[ \t-]*//' ansible-role-requirements.yml | awk '/src: / || /name: / {print $2}' | grep -B1 "${role_src}" | head -n 1)
echo "... updating ${role_name}"
# If the role_src is NOT from git.openstack.org, try to get a tag first
if [[ ${role_src} != *"git.openstack.org"* ]]; then
# If the role_src is NOT from git.openstack.org, try to get a tag first unless we are working on master
if [[ ${role_src} != *"git.openstack.org"* ]] && [[ "${force_master}" != "true" ]]; then
role_version=$(git ls-remote --tags ${role_src} | awk '{print $2}' | grep -v '{}' | cut -d/ -f 3 | sort -n | tail -n 1)
fi