openstack/nova
Code Issues Proposed changes

Merge "[tools] Backport validator: handle unmaintained" into unmaintained/zed

Browse Source
This commit is contained in:
Zuul
2024-08-01 12:21:40 +00:00
committed by Gerrit Code Review
parent f17e23e833 f43ceef576
commit 41cdd39e86
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/check-cherry-picks.sh
View File

@@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
# #
# A tool to check the cherry-pick hashes from the current git commit message # 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 # to verify that they're all on either master, stable/ or unmaintained/
# branches
# #
commit_hash="" commit_hash=""
@@ -23,9 +24,9 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke
checked=0 checked=0
branches+="" branches+=""
for hash in $hashes; do for hash in $hashes; do
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)') branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+|unmaintained/[a-z0-9.]+)')
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Cherry pick hash $hash not on any master or stable branches" echo "Cherry pick hash $hash not on any master, stable or unmaintained branches"
exit 1 exit 1
fi fi
branches+=" $branch" branches+=" $branch"
@@ -33,7 +34,7 @@ for hash in $hashes; do
done done
if [ $checked -eq 0 ]; then if [ $checked -eq 0 ]; then
if ! grep -q '^defaultbranch=stable/' .gitreview; then if ! grep -qE '^defaultbranch=(stable|unmaintained)/' .gitreview; then
echo "Checked $checked cherry-pick hashes: OK" echo "Checked $checked cherry-pick hashes: OK"
exit 0 exit 0
else else