Rollback of commit ffc0d2df0213123a4451bed5850827319afcdeee.

*** Reason for rollback ***

Grr I knew I shouldn't have done 2 changes in one tests are failing now

Fixes #2429.

*** Original change description ***

Release scripts: factor out the push to notes and fix a typo

--
PiperOrigin-RevId: 145657489
MOS_MIGRATED_REVID=145657489

1 files changed, 12 insertions, 12 deletions

diff --git a/scripts/release/release.sh b/scripts/release/release.sh
index defb013f92..988c497d6d 100755
--- a/scripts/release/release.sh
+++ b/scripts/release/release.sh
@@ -274,24 +274,19 @@ function push_if_exists() {
   fi
 }
 
-# Push release notes refs but also a given ref
-function push_notes_and_ref() {
-  local ref="$1"
+# Push the release branch to the release repositories so a release
+# candidate can be created.
+function push_release_candidate() {
+  local branch="$(get_release_branch)"
   for repo in ${RELEASE_REPOSITORIES}; do
-    push_if_exists "${repo}" "${ref}"
+    push_if_exists "${repo}" "${branch}"
     push_if_exists "${repo}" "refs/notes/release"
-    push_if_exists "${repo}" "refs/notes/release-candidate"
+    push_if_exists "${repo}" "refs/notes/release-candidates"
     push_if_exists "${repo}" "refs/notes/release-notes"
     push_if_exists "${repo}" "refs/notes/cherrypick"
   done
 }
 
-# Push the release branch to the release repositories so a release
-# candidate can be created.
-function push_release_candidate() {
-  push_notes_and_ref "$(get_release_branch)"
-}
-
 # Deletes the release branch after a release or abandoning the release
 function cleanup_branches() {
   local tag_name=$1
@@ -340,7 +335,12 @@ function do_release() {
     for i in $MASTER_REPOSITORIES; do
       git push $i +master
     done
-    push_notes_and_ref "+refs/tags/${tag_name}"
+    for i in $RELEASE_REPOSITORIES; do
+      git push $i +refs/tags/${tag_name}
+      git push $i +refs/notes/release-candidate
+      git push $i +refs/notes/release
+      git push $i +refs/notes/release-notes
+    done
     cleanup_branches ${tag_name}
   fi
 }