From a0b1fef715bb5ed951d377e4c712a3513238fd8b Mon Sep 17 00:00:00 2001 From: elajkat Date: Mon, 5 Aug 2024 11:39:06 +0200 Subject: [PATCH] Handle_tags and branches for unmaintained also Related-Bug: #2056276 Change-Id: Iaa34624d1d85cadf1b45bec780ef8d97dd054041 (cherry picked from commit 92b65a84cc8135316922a0f8b91420ed221f3269) (cherry picked from commit 0c1e594e45dc877c54d966fe9053aa0b13993c32) (cherry picked from commit d59e528c743233f4a6883c90f6e6c959f8f78daf) (cherry picked from commit c52f50ee8c07462813fd22452084b889741f7ab1) (cherry picked from commit c755ca9219e109a94edf3364390fa995bf0dbf3e) (cherry picked from commit d7b71cb65b2c84422e4b7dcaecda2f419e29c99d) (cherry picked from commit 5986c350aee33e40d31d73f9fabf9d40bd8aa80f) (cherry picked from commit 5fb4b915ca923688147795e910f2d22bf375a7be) --- roles/setup-devstack-source-dirs/tasks/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/setup-devstack-source-dirs/tasks/main.yaml b/roles/setup-devstack-source-dirs/tasks/main.yaml index 294c29cd29..cb7c6e3af8 100644 --- a/roles/setup-devstack-source-dirs/tasks/main.yaml +++ b/roles/setup-devstack-source-dirs/tasks/main.yaml @@ -43,9 +43,9 @@ base_branch={{ devstack_sources_branch }} if git branch -a | grep "$base_branch" > /dev/null ; then git checkout $base_branch - elif [[ "$base_branch" == stable/* ]]; then + elif [[ "$base_branch" == stable/* ]] || [[ "$base_branch" == unmaintained/* ]]; then # Look for an eol tag for the stable branch. - eol_tag=${base_branch#stable/}-eol + eol_tag="${base_branch#*/}-eol" if git tag -l |grep $eol_tag >/dev/null; then git checkout $eol_tag git reset --hard $eol_tag