From 3e54b3c0e7c6401fe92ea690bb0e66388833ec14 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 30 Jul 2021 19:29:57 +0530 Subject: [PATCH] Fix Usage of rdo-release rpm rdo-release.el8.rpm rpm points to latest RDO release, so use it for master, for stable releases use corresponding release rpm. Change-Id: I508eceb00d7501ffcfac73d7bc2272badb241494 (cherry picked from commit 0456baaee5309431cd1f88ba4a0ceaa7f050b743) --- stack.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/stack.sh b/stack.sh index ad5d238f45..035cd31350 100755 --- a/stack.sh +++ b/stack.sh @@ -292,10 +292,14 @@ function _install_epel { } function _install_rdo { - # NOTE(ianw) 2020-04-30 : when we have future branches, we - # probably want to install the relevant branch RDO release as - # well. But for now it's all master. - sudo dnf -y install https://rdoproject.org/repos/rdo-release.el8.rpm + if [[ "$TARGET_BRANCH" == "master" ]]; then + # rdo-release.el8.rpm points to latest RDO release, use that for master + sudo dnf -y install https://rdoproject.org/repos/rdo-release.el8.rpm + else + # For stable branches use corresponding release rpm + rdo_release=$(echo $TARGET_BRANCH | sed "s|stable/||g") + sudo dnf -y install https://rdoproject.org/repos/openstack-${rdo_release}/rdo-release-${rdo_release}.el8.rpm + fi sudo dnf -y update }