diff --git a/scripts/sources-branch-updater-lib.sh b/scripts/sources-branch-updater-lib.sh index 2c06b8da2b..da2ac5ce58 100644 --- a/scripts/sources-branch-updater-lib.sh +++ b/scripts/sources-branch-updater-lib.sh @@ -256,6 +256,12 @@ update_ansible_role_requirements() { role_version=$(git ls-remote ${role_src} | grep "${osa_branch}$" | awk '{print $1}') 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 if [[ ${role_src} == *"git.openstack.org"* ]]; then local osa_repo_tmp_path="/tmp/osa_${role_name}"