Browse code
Fix rdo-release install
The URL for rdo-release package is version-less and redirects to latest
stable version. This becomes problematic when stacking older stable
versions as dependencies might not be met or newer and incompatibile
ones might get installed.
Closes-Bug: #1833696
Change-Id: Icb07dcb4c9a3950a3c31a3a8dcb8d0b4c713fdb1
Carlos Goncalves authored on 2019/06/21 20:13:40Showing 1 changed files
| ... | ... |
@@ -331,7 +331,13 @@ function _install_rdo {
|
| 331 | 331 |
# Per the point above, it's a bunch of repos so starts getting a |
| 332 | 332 |
# little messy... |
| 333 | 333 |
if ! is_package_installed rdo-release ; then |
| 334 |
- yum_install https://rdoproject.org/repos/rdo-release.rpm |
|
| 334 |
+ if [[ "$TARGET_BRANCH" == "master" ]]; then |
|
| 335 |
+ yum_install https://rdoproject.org/repos/rdo-release.rpm |
|
| 336 |
+ else |
|
| 337 |
+ # Get latest rdo-release-$rdo_release RPM package version |
|
| 338 |
+ rdo_release=$(echo $TARGET_BRANCH | sed "s|stable/||g") |
|
| 339 |
+ yum_install https://rdoproject.org/repos/openstack-$rdo_release/rdo-release-$rdo_release.rpm |
|
| 340 |
+ fi |
|
| 335 | 341 |
fi |
| 336 | 342 |
|
| 337 | 343 |
# Also enable optional for RHEL7 proper. Note this is a silent |