From 058b2fbb8cab02db1e5041066a8b1f91dc8c4810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Wed, 21 Oct 2020 20:33:08 +0200
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.

In addition to backport this commit:

1. Add centos8-stream job to show fix is working fine becasue
there is no centos8 repo for wallaby and centos8 job does not validate
this backport. We can remove the centos8 job later in follow up. I
did not it in this commit to keep this backport as clean as possible.

2. backport below commit to fix centos8-stream job

Set swap size to 4G for c8 jobs

Tempest is failing randomly with different reasons
as mentioned in the bug, updating swap size those
issues are not seen.

Before [1] default swap size used to be 8GB but was dropped
to 1G so need to configure it in required job itself.

Did couple of tests in [2] and with 4GB+ swap jobs are
running green. On investigation found that with qemu-5
both Ubuntu and CentOS jobs have memory crunch, currently
Ubuntu jobs are not impacted as they are running with
qemu-4.

[1] https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/750941
[2] https://review.opendev.org/c/openstack/devstack/+/803144

Closes-Bug: #1938914
Change-Id: I57910b5fde5ddf2bd37d93e06c1aff77c6e231e9
(cherry picked from commit 60b5538c337dfa3c8f60fecdc64e671acd1f1cbe)

Change-Id: I508eceb00d7501ffcfac73d7bc2272badb241494
(cherry picked from commit 0456baaee5309431cd1f88ba4a0ceaa7f050b743)
---
 .zuul.yaml | 21 +++++++++++++++++++++
 stack.sh   | 12 ++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 89f490cea1..df4c67d77c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -58,6 +58,16 @@
         nodes:
           - controller
 
+- nodeset:
+    name: devstack-single-node-centos-8-stream
+    nodes:
+      - name: controller
+        label: centos-8-stream
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
 - nodeset:
     name: devstack-single-node-opensuse-15
     nodes:
@@ -581,6 +591,16 @@
     nodeset: openstack-single-node-bionic
     voting: false
 
+- job:
+    name: devstack-platform-centos-8-stream
+    parent: tempest-full-py3
+    description: CentOS 8 Stream platform test
+    nodeset: devstack-single-node-centos-8-stream
+    voting: false
+    timeout: 9000
+    vars:
+      configure_swap_size: 4096
+
 - job:
     name: devstack-async
     parent: tempest-full-py3
@@ -666,6 +686,7 @@
         - devstack-ipv6
         - devstack-platform-centos-8
         - devstack-platform-bionic
+        - devstack-platform-centos-8-stream
         - devstack-async
         - devstack-multinode
         - devstack-unit-tests
diff --git a/stack.sh b/stack.sh
index 163fc5b370..e786379296 100755
--- a/stack.sh
+++ b/stack.sh
@@ -300,10 +300,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
 }