diff options
| author | Elod Illes <elod.illes@est.tech> | 2023-05-11 16:19:38 +0200 |
|---|---|---|
| committer | Elod Illes <elod.illes@est.tech> | 2023-05-11 17:06:29 +0200 |
| commit | 7e3a8a1ba7c27d1508abc2e21921774f3cf29089 (patch) | |
| tree | 1c0becaa4cfdd884f43c2f1d916976b73b4331ef | |
| parent | 9813eac48bfcf00d2b1d98bec55ec5fe9c72ee25 (diff) | |
| download | nova-stable/wallaby.tar.gz | |
CI: fix backport validator for new branch namingstable/wallaby
validate-backport job started to fail as only old stable branch naming
is accepted. This patch extends the script to allow numbers and dot as
well in the branch names (like stable/2023.1).
Change-Id: Icbdcd5d124717e195d55d9e42530611ed812fadd
(cherry picked from commit fe125da63b6508788654f0dab721f13005c09d25)
(cherry picked from commit 09f85a8a922e4ad68271886d2389042d4f4d6896)
(cherry picked from commit abd9a34a6014730620cee15a44f328e48e57398e)
(cherry picked from commit acb31f01b1f10e1101c520657b2e6432a99e4b35)
(cherry picked from commit 41895386349ee8d8acea6b1278a2b54c6f9d750f)
| -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 5a449c520b..e985d871da 100755 --- a/tools/check-cherry-picks.sh +++ b/tools/check-cherry-picks.sh @@ -18,7 +18,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 |