From 83fc4eba3e62e1afc49ead645fb3ed007953fd72 Mon Sep 17 00:00:00 2001
From: Dan Mick <dmick@redhat.com>
Date: Tue, 27 Feb 2024 18:59:46 -0800
Subject: [PATCH] doc/dev/release-process.rst: modify for prerelease mechanism

Signed-off-by: Dan Mick <dmick@redhat.com>
---
 doc/dev/release-process.rst | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/doc/dev/release-process.rst b/doc/dev/release-process.rst
index 269983de6eb58..53f6e9470845a 100644
--- a/doc/dev/release-process.rst
+++ b/doc/dev/release-process.rst
@@ -33,8 +33,11 @@ Summarized build process
 4. Packages are pushed to chacra.ceph.com.
 5. Packages are pulled from chacra.ceph.com to the Signer VM.
 6. Packages are signed.
-7. Packages are pushed to download.ceph.com.
-8. Release containers are built and pushed to quay.io.
+7. Packages are pushed to a prerelease area on download.ceph.com.
+8. Prerelease containers are built and pushed to quay.ceph.io.
+9. Final test and validation are done on prerelease packages and containers.
+10. Prerelease packages and containers are promoted to official releases on
+    download.ceph.com and quay.io.
 
 Hotfix Release Process Deviation
 --------------------------------
@@ -205,14 +208,28 @@ See `the Ceph Tracker wiki page that explains how to write the release notes <ht
 
       sync-push octopus
 
+This leaves the packages in a password-protected prerelease area
+at https://download.ceph.com/prerelease.  Verify them from there.  
+When done and ready for release, mv the directories to the parent
+directory (that is, "mv <whatever you're promoting> ..".  
+
+
 5. Build Containers
 ===================
 
-Start the following two jobs:
+Prerelease containers (x86_64 only) are built by 
+https://2.jenkins.ceph.com/job/ceph-container-prerelease-build; run it 
+with appropriate parameters.  Test container images will appear on
+quay.ceph.io in the ceph/prerelease repo, built from the prerelease area
+on download.ceph.com.  When satisfied with them, and after you have promoted
+the prerelease packages to released status as above, start the following two jobs:
 
 #. https://2.jenkins.ceph.com/job/ceph-container-build-ceph-base-push-imgs/
 #. https://2.jenkins.ceph.com/job/ceph-container-build-ceph-base-push-imgs-arm64/
 
+which will rebuild and publish both architectures using the released packages
+on download.ceph.com (into a multiarchitecture container image).
+
 6. Announce the Release
 =======================
 
-- 
2.39.5