From 381b22bdd628117d25400b691d657501986b84ce Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mar 21 2024 21:13:00 +0000
Subject: Adjust beta release doc with various tweaks


Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/modules/release_guide/pages/beta_release.adoc b/modules/release_guide/pages/beta_release.adoc
index 24323db..f4e6f10 100644
--- a/modules/release_guide/pages/beta_release.adoc
+++ b/modules/release_guide/pages/beta_release.adoc
@@ -4,6 +4,13 @@ include::_partials/attributes.adoc[]
 
 Based on the GO/NOGO meeting if the currnet compose is GO. The following steps need to be taken.
 
+== Wait for branched compose that matches the beta rc
+
+QE will typically request a stable push of all the updates that were in the Beta RC that
+was signed off on. After that stable push we need to wait for a branched compose with them.
+This ensures that the nightly branched has the same content as the beta we are about to release.
+This is to allow us to make sure and tag all the right packages and have a common point.
+
 == Koji changes
 
 [source,subs="attributes+"]
@@ -36,6 +43,11 @@ following command
 $ for dir in Cloud Container Everything Kinoite Labs Sericea Server Silverblue Spins Workstation metadata; do sudo -u ftpsync rsync -avhH /mnt/koji/compose/{branched}/Fedora-{branched}-20221105.0/compose/$dir/ /pub/alt/stage/{branched}_RC-1.7/$dir/ --link-dest=/pub/fedora/linux/releases/{branched}/Everything/ --link-dest=/pub/alt/stage/{branched}_RC-1.2/Everything/ --link-dest=/pub/alt/stage/{branched}_RC-1.3/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.4/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.5/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.6/Everything --link-dest=/pub/alt/stage/{branched}_RC-1.7/Everything; done
 ....
 
+[NOTE]
+====
+Replace the RC above with the RC that was 'go'
+====
+
 == Set release in Bodhi to pending
 
 [source,subs="attributes+"]
@@ -48,9 +60,13 @@ $ bodhi releases edit --name F{branched} --state pending
 Lift the RelEng Freeze so that the updates will be pushed to stable.
 This is done by editing
 https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/vars/all/RelEngFrozen.yaml[RelEngFrozen
-variable] in infra ansible repo and then run the bodhi playbook.
-Set also https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/vars/all/FedoraBranchedBodhi.yaml[FedoraBranchedBodhi
-variable] to postbeta
+variable] in infra ansible repo.
+
+Set also https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/vars/all/FedoraBranchedBodhi.yaml[FedoraBranchedBodhi variable] to postbeta
+
+Then run both bodhi playbooks:
+playbooks/groups/bodhi-backend01.yml and playbooks/openshift-apps/bodhi.yml
+(One for the backend vm and one for the OpenShift application)
 
 == Beta Installation and Cleanup
 
@@ -68,18 +84,6 @@ $ rm -rf /pub/fedora/linux/releases/test/{branched}_Beta
 
 Note that {branched} should be replaced with the name of the beta release, such as 36_Beta, 37_Beta, etc.
 
-=== Set correct permissions
-
-This step is to set the correct permissions on the directories. This can be done using the chmod command:
-
-[source,subs="attributes+"]
-....
-$ chmod g+rx /pub/fedora-secondary/releases/test/{branched}_Beta
-$ chmod g+rx /pub/fedora/linux/releases/test/{branched}_Beta
-....
-
-Again, {branched} should be replaced with the name of the beta release.
-
 By following these steps, one can ensure that older copies of Fedora betas are removed from the servers and that the correct permissions are set on the directories.
 
 == Run the playbooks
@@ -87,4 +91,5 @@ By following these steps, one can ensure that older copies of Fedora betas are r
 ....
 $ sudo rbac-playbook groups/releng-compose.yml
 $ sudo rbac-playbook groups/bodhi-backend.yml
+$ sudo rbac-playbook openshift-apps/bodhi.yml
 ....