github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69574 from dims/cherry_pick_pull-should-work-across-repos

Browse Source 
cherry_pick_pull should work for non-k/k repos
This commit is contained in:
k8s-ci-robot 2018-10-12 11:20:21 -07:00 committed by GitHub
commit c75d772ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hack/cherry_pick_pull.sh
View File

@ -16,22 +16,26 @@
# Checkout a PR from GitHub. (Yes, this is sitting in a Git tree. How # Checkout a PR from GitHub. (Yes, this is sitting in a Git tree. How
# meta.) Assumes you care about pulls from remote "upstream" and # meta.) Assumes you care about pulls from remote "upstream" and
# checks thems out to a branch named: # checks them out to a branch named:
# automated-cherry-pick-of-<pr>-<target branch>-<timestamp> # automated-cherry-pick-of-<pr>-<target branch>-<timestamp>
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
declare -r KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.." REPO_ROOT="$(git rev-parse --show-toplevel)"
cd "${KUBE_ROOT}" declare -r REPO_ROOT
cd "${REPO_ROOT}"
declare -r STARTINGBRANCH=$(git symbolic-ref --short HEAD) STARTINGBRANCH=$(git symbolic-ref --short HEAD)
declare -r REBASEMAGIC="${KUBE_ROOT}/.git/rebase-apply" declare -r STARTINGBRANCH
declare -r REBASEMAGIC="${REPO_ROOT}/.git/rebase-apply"
DRY_RUN=${DRY_RUN:-""} DRY_RUN=${DRY_RUN:-""}
REGENERATE_DOCS=${REGENERATE_DOCS:-""} REGENERATE_DOCS=${REGENERATE_DOCS:-""}
UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream} UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream}
FORK_REMOTE=${FORK_REMOTE:-origin} FORK_REMOTE=${FORK_REMOTE:-origin}
MAIN_REPO_ORG=${MAIN_REPO_ORG:-$(git remote get-url "$UPSTREAM_REMOTE" | awk -F'[@:./]' 'NR==1{print $4}')}
MAIN_REPO_NAME=${MAIN_REPO_NAME:-$(git remote get-url "$UPSTREAM_REMOTE" | awk -F'[@:./]' 'NR==1{print $5}')}
if [[ -z ${GITHUB_USER:-} ]]; then if [[ -z ${GITHUB_USER:-} ]]; then
echo "Please export GITHUB_USER=<your-user> (or GH organization, if that's where your fork lives)" echo "Please export GITHUB_USER=<your-user> (or GH organization, if that's where your fork lives)"
@ -140,7 +144,7 @@ Cherry pick of ${PULLSUBJ} on ${rel}.
${numandtitle} ${numandtitle}
EOF EOF
hub pull-request -F "${prtext}" -h "${GITHUB_USER}:${NEWBRANCH}" -b "kubernetes:${rel}" hub pull-request -F "${prtext}" -h "${GITHUB_USER}:${NEWBRANCH}" -b "${MAIN_REPO_ORG}:${rel}"
} }
git checkout -b "${NEWBRANCHUNIQ}" "${BRANCH}" git checkout -b "${NEWBRANCHUNIQ}" "${BRANCH}"
@ -149,7 +153,8 @@ cleanbranch="${NEWBRANCHUNIQ}"
gitamcleanup=true gitamcleanup=true
for pull in "${PULLS[@]}"; do for pull in "${PULLS[@]}"; do
echo "+++ Downloading patch to /tmp/${pull}.patch (in case you need to do this again)" echo "+++ Downloading patch to /tmp/${pull}.patch (in case you need to do this again)"
curl -o "/tmp/${pull}.patch" -sSL "http://pr.k8s.io/${pull}.patch"
curl -o "/tmp/${pull}.patch" -sSL "https://github.com/${MAIN_REPO_ORG}/${MAIN_REPO_NAME}/pull/${pull}.patch"
echo echo
echo "+++ About to attempt cherry pick of PR. To reattempt:" echo "+++ About to attempt cherry pick of PR. To reattempt:"
echo " $ git am -3 /tmp/${pull}.patch" echo " $ git am -3 /tmp/${pull}.patch"
@ -211,8 +216,8 @@ if [[ -n "${DRY_RUN}" ]]; then
exit 0 exit 0
fi fi
if git remote -v | grep ^${FORK_REMOTE} | grep kubernetes/kubernetes.git; then if git remote -v | grep ^${FORK_REMOTE} | grep ${MAIN_REPO_ORG}/${MAIN_REPO_NAME}.git; then
echo "!!! You have ${FORK_REMOTE} configured as your kubernetes/kubernetes.git" echo "!!! You have ${FORK_REMOTE} configured as your ${MAIN_REPO_ORG}/${MAIN_REPO_NAME}.git"
echo "This isn't normal. Leaving you with push instructions:" echo "This isn't normal. Leaving you with push instructions:"
echo echo
echo "+++ First manually push the branch this script created:" echo "+++ First manually push the branch this script created:"