Use RDO official CloudSIG mirrors for C9S deployments

amoralej · yadneshk · commit b050ce825328 · 2023-09-25T09:26:19.000Z
Instead of using RDO Trunk repo server, CentOS official mirrors provide a most reliable infrastructure and supports EMS which is required when enabling FIPS in C9S. RDO didn't publish official release rpms for Xena and Wallaby, install "rdo-release-yoga" release rpm for Xena. Devstack only uses RDO repository for binary dependencies such as rabbitmq, openvswitch. Change 0da88c4 is squashed in this commit. Closes-Bug: #2020661 Closes-Bug: #2020434 Change-Id: Icd99f467d47aaafaaf3ee8f2a3c4da08842cb672 (cherry picked from commit b2ad00c) (cherry picked from commit 4062cc0)
diff --git a/stack.sh b/stack.sh
@@ -310,7 +310,16 @@ function _install_rdo {
             sudo dnf -y install https://rdoproject.org/repos/openstack-${rdo_release}/rdo-release-${rdo_release}.el8.rpm
         fi
     elif [[ $DISTRO == "rhel9" ]]; then
-        sudo curl -L -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos9-master/delorean-deps.repo
+        if [[ "$TARGET_BRANCH" == "master" ]]; then
+            # rdo-release.el9.rpm points to latest RDO release, use that for master
+            sudo dnf -y install https://rdoproject.org/repos/rdo-release.el9.rpm
+        else
+            # RDO didn't publish official releases for Xena and Wallaby, only RDO Trunk repos. 
+            # Since the RDO Trunk server does not support EMS, FIPS jobs will fail to use it.
+            # Use "rdo-release-yoga" release rpm for both xena and wallaby jobs.
+            rdo_release="yoga"
+            sudo dnf -y install https://rdoproject.org/repos/openstack-${rdo_release}/rdo-release-${rdo_release}.el9.rpm
+        fi
     fi
     sudo dnf -y update
 }
