openstack/openstack-ansible
Code Issues Proposed changes

Merge "scripts: Fix getting external role SHA when working on master"

Browse Source
This commit is contained in:
Zuul 2018-09-04 11:37:58 +00:00 committed by Gerrit Code Review
commit 7b0d39cb7e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,6 +256,12 @@ update_ansible_role_requirements() {
role_version=$(git ls-remote ${role_src} | grep "${osa_branch}$" | awk '{print $1}') role_version=$(git ls-remote ${role_src} | grep "${osa_branch}$" | awk '{print $1}')
fi fi
# If we are forcing master and we still don't have a role_version defined, then we need
# to fallback to master branch
if [[ -z "${role_version}" ]] && [[ "${force_master}" == "true" ]]; then
role_version=$(git ls-remote ${role_src} | grep master | awk '{print $1}')
fi
# For OSA roles, get the release notes # For OSA roles, get the release notes
if [[ ${role_src} == *"git.openstack.org"* ]]; then if [[ ${role_src} == *"git.openstack.org"* ]]; then
local osa_repo_tmp_path="/tmp/osa_${role_name}" local osa_repo_tmp_path="/tmp/osa_${role_name}"