Merge pull request #10167 from hashicorp/dnephin/ci-cherry-pick-on-release-branch

ci: allow cherry-picking a manual backport to other release branches

.circleci/config.yml

@@ -1123,6 +1123,7 @@ workflows:
             branches:
               only:
                 - master
+                - /release\/\d+\.\d+\.x$/
   load-test:
     when: << pipeline.parameters.trigger-load-test >>
     jobs:

.circleci/scripts/cherry-picker.sh

@@ -165,11 +165,12 @@ if echo "$resp" | jq -e '.items[].labels[] | select(.name | contains("docs-cherr
     fi
 fi
 
+git config --local user.email "github-team-consul-core@hashicorp.com"
+git config --local user.name "hc-github-team-consul-core"
+
 backport_failures=0
 # loop through all labels on the PR
 for label in $labels; do
-    git config --local user.email "github-team-consul-core@hashicorp.com"
-    git config --local user.name "hc-github-team-consul-core"
     status "checking label: $label"
     # if the label matches docs-cherrypick, it will attempt to cherry-pick to stable-website
     if [[ $label =~ docs-cherrypick ]]; then