openstack/nova
Code Issues Proposed changes

[tools] Backport validator: handle unmaintained

Browse Source 
When the script was created there were only stable/* branches, but now
there are unmaintained/* branches as well, where the validator fails
when looking for hashes only on stable/* branches even if the given
hash is already on unmtaintained/* branch. This patch matches now both
stable/* and unmaintained/* branches.

Change-Id: I08fcc63ab0fbe5af1be70d5fde5af98bf006101c
(cherry picked from commit e2697de8e4)
(cherry picked from commit 602e68364c)
(cherry picked from commit 56e73cc7ba)
(cherry picked from commit f53824f95b)
(cherry picked from commit f43ceef576)
This commit is contained in:
Elod Illes
2024-07-12 23:10:26 +02:00
parent 4d2b894e77
commit 7b7bac3e21
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
#
# 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=""
@@ -23,9 +24,9 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke
checked=0
branches+=""
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
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
fi
branches+=" $branch"
@@ -33,7 +34,7 @@ for hash in $hashes; do
done
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"
exit 0
else