Merge "Remove file path from migration commit msg"

1 files changed, 8 insertions, 2 deletions

diff --git a/tools/migrate_from_tempest.sh b/tools/migrate_from_tempest.sh
index 48ad2bf..a91cea8 100755
--- a/tools/migrate_from_tempest.sh
+++ b/tools/migrate_from_tempest.sh
@@ -53,7 +53,8 @@ cd $tmpdir
 for file in $files; do
     # Get the latest change-id for each file
     change_id=`git log -n1 --grep "Change-Id: " -- $file | grep "Change-Id: " | awk '{print $2}'`
-    CHANGE_LIST=`echo -e "$CHANGE_LIST\n * $file: $change_id"`
+    filename=`basename $file`
+    CHANGE_LIST=`echo -e "$CHANGE_LIST\n * $filename: $change_id"`
 done
 
 # Move files and commit
@@ -102,4 +103,9 @@ rm -rf $tmpdir
 commit_message="Migrated $file_list from tempest"
 pre_list=$"This migrates the above files from tempest. This includes tempest commits:"
 post_list=$"to see the commit history for these files refer to the above Change-Ids in the tempest repository"
-git commit -m "$commit_message" -m "$pre_list" -m "$CHANGE_LIST" -m "$post_list"
+if [ $service_client -eq 1 ]; then
+    bp_msg="Partially implements blueprint migrate-service-clients-to-tempest-lib"
+else
+    bp_msg=""
+fi
+git commit -m "$commit_message" -m "$pre_list" -m "$CHANGE_LIST" -m "$post_list" -m "$bp_msg"