From 1ee69024d60443bf4b2d259cd7b445df5e415f85 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Wed, 6 Sep 2023 02:34:39 -0400
Subject: [PATCH] release script update

---
 scripts/release-branch.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/release-branch.sh b/scripts/release-branch.sh
index 05467ac77..8f59d8871 100755
--- a/scripts/release-branch.sh
+++ b/scripts/release-branch.sh
@@ -17,6 +17,8 @@ default()
 
   UI_DIR="$TMP_DIR/koku-ui"
   UI_REPO="git@github.com:project-koku/koku-ui.git"
+
+  BODY_FILE="$UI_DIR/body"
 }
 
 usage()
@@ -49,6 +51,14 @@ clone()
   git clone $UI_REPO
 }
 
+createPullRequestBody()
+{
+cat <<- EEOOFF > $BODY_FILE
+Merged $REMOTE_BRANCH branch to $BRANCH.
+
+Use latest commit to update namespace \`ref\` in app-interface repo. Don't use merge commit, SHAs must be unique when images are created for each branch.
+EEOOFF
+}
 
 merge()
 {
@@ -67,7 +77,7 @@ merge()
 # Use gh in a non-interactive way -- see https://github.com/cli/cli/issues/1718
 pullRequest()
 {
-  NEW_BRANCH="release/${BRANCH}.$$"
+  NEW_BRANCH="release_${BRANCH}.$$"
 
   git branch -m $NEW_BRANCH
 
@@ -75,7 +85,7 @@ pullRequest()
   git push -u origin HEAD
 
   TITLE="Deployment commit for $BRANCH"
-  BODY="Merged $REMOTE_BRANCH branch to $BRANCH. Use latest commit to update namespace \`ref\` in app-interface repo. Don't use merge commit, SHAs must be unique when images are created for each branch."
+  BODY=`cat $BODY_FILE`
 
   gh pr create -t "$TITLE" -b "$BODY" -B $BRANCH
 }
@@ -124,6 +134,7 @@ push()
     if [ -n "$PUSH" ]; then
       push
     else
+      createPullRequestBody
       pullRequest
     fi
   else