diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-21 09:20:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-21 09:20:47 +0000 |
| commit | 938fb3385cac97225c3ae2cca34afc43d8379252 (patch) | |
| tree | 18c06ec505538d05ebafd55afb32491e750cfd98 | |
| parent | faa8bf83ccd46ebc696b70e1df40cb6a8acd58c1 (diff) | |
| parent | e605600d9e45f1b88ecc5c68c1ec4e24ceea6bd5 (diff) | |
| download | nova-938fb3385cac97225c3ae2cca34afc43d8379252.tar.gz | |
Merge "Check cherry-pick hashes in pep8 tox target" into stable/queens
| -rwxr-xr-x | tools/check-cherry-picks.sh | 42 | ||||
| -rw-r--r-- | tox.ini | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh new file mode 100755 index 0000000000..32627e59b6 --- /dev/null +++ b/tools/check-cherry-picks.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# +# A tool to check the cherry-pick hashes from the current git commit message +# to verify that they're all on either master or stable/ branches +# + +commit_hash="" + +# Check if the patch is a merge patch by counting the number of parents. +# If the patch has 2 parents, then the 2nd parent is the patch we want +# to validate. +parent_number=$(git show --format='%P' --quiet | awk '{print NF}') +if [ $parent_number -eq 2 ]; then + commit_hash=$(git show --format='%P' --quiet | awk '{print $NF}') +fi + +hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picked from commit (.*).$/\1/p') +checked=0 +branches+="" +for hash in $hashes; do + branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z]+)') + if [ $? -ne 0 ]; then + echo "Cherry pick hash $hash not on any master or stable branches" + exit 1 + fi + branches+=" $branch" + checked=$(($checked + 1)) +done + +if [ $checked -eq 0 ]; then + if ! grep -q '^defaultbranch=stable/' .gitreview; then + echo "Checked $checked cherry-pick hashes: OK" + exit 0 + else + if ! git show --format='%B' --quiet | grep -qi 'stable.*only'; then + echo 'Stable branch requires either cherry-pick -x headers or [stable-only] tag!' + exit 1 + fi + fi +else + echo Checked $checked cherry-pick hashes on branches: $(echo $branches | tr ' ' '\n' | sort | uniq) +fi @@ -55,6 +55,7 @@ commands = bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'" # Check that all included JSON files are valid JSON bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python' + bash tools/check-cherry-picks.sh [testenv:fast8] # This is a subset of the full pep8 check which |