From 8f1b33d34effcc28c94fa7113304254bae0470a5 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 21 Jul 2016 19:54:01 +0100 Subject: [PATCH] Update the sources-branch-updater This implements the following changes: - Remove the workaround for the Ironic repo name mismatch. - Use the branch/topic 'sha-update' when updating the files/templates in each role repository. Change-Id: I7f2b74fa21df8f1f18a3a1dbfc7a5d716083cf63 --- scripts/sources-branch-updater.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh index bd5e21c131..86599baa8a 100755 --- a/scripts/sources-branch-updater.sh +++ b/scripts/sources-branch-updater.sh @@ -98,11 +98,7 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do popd > /dev/null # Set the OSA address - if [[ "${repo_name}" == "ironic" ]]; then - osa_repo_address="https://git.openstack.org/openstack/openstack-ansible-ironic" - else - osa_repo_address="https://git.openstack.org/openstack/openstack-ansible-os_${repo_name}" - fi + osa_repo_address="https://git.openstack.org/openstack/openstack-ansible-os_${repo_name}" # Do a shallow clone of the OSA repo to work with git clone --quiet --depth=10 --branch ${OSA_BRANCH} --single-branch ${osa_repo_address} ${osa_repo_tmp_path} @@ -163,6 +159,7 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do # If any files have changed, submit a patch including the changes if [ ${git_changed} -gt 0 ]; then + git checkout -b sha-update git review -s > /dev/null git add --all git commit -a -m "${git_msg_prefix}Update paste, policy and rootwrap configurations $(date +%Y-%m-%d)" --quiet