diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-12 08:29:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-12 08:29:55 +0000 |
| commit | fc56b368d7c6fd5eb8671505a464a425df504f0e (patch) | |
| tree | 9d1111150511985796ba50e2eb0f1abcbea0327d | |
| parent | c1152aef796792224963986834e68664aea05206 (diff) | |
| parent | acb31f01b1f10e1101c520657b2e6432a99e4b35 (diff) | |
| download | nova-fc56b368d7c6fd5eb8671505a464a425df504f0e.tar.gz | |
Merge "CI: fix backport validator for new branch naming" into stable/yoga
| -rwxr-xr-x | tools/check-cherry-picks.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh index 46cef8c225..3042aa1659 100755 --- a/tools/check-cherry-picks.sh +++ b/tools/check-cherry-picks.sh @@ -23,7 +23,7 @@ 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-z]+)') + branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)') if [ $? -ne 0 ]; then echo "Cherry pick hash $hash not on any master or stable branches" exit 1 |