ci: fix cherry-pick job by using newer git

37897bfc27 made it possible to use
the -m flag with cherry-pick, even when the target is not a merge commit.

This commit changes the image used to run the cherry-pick job to alpine so that we get
a more recent version of git.

The alpine image will also download much faster when the CI node does not have the image cached.
This commit is contained in:
Daniel Nephin 2020-03-23 14:18:45 -04:00
parent 98a2d5a798
commit 3418835677
1 changed files with 2 additions and 1 deletions

View File

@ -593,8 +593,9 @@ jobs:
# only runs on master: checks latest commit to see if the PR associated has a backport/* or docs* label to cherry-pick # only runs on master: checks latest commit to see if the PR associated has a backport/* or docs* label to cherry-pick
cherry-picker: cherry-picker:
docker: docker:
- image: *GOLANG_IMAGE - image: alpine:3.11
steps: steps:
- run: apk add --no-cache --no-progress git bash curl ncurses jq
- checkout - checkout
- add_ssh_keys: # needs a key to push cherry-picked commits back to github - add_ssh_keys: # needs a key to push cherry-picked commits back to github
fingerprints: fingerprints: