Merge pull request ceph#48913 from jdurgin/wip-octopus-eol

doc/releases: mark octopus eol Reviewed-by: Neha Ojha <[email protected]> Reviewed-by: Anthony D'Atri <[email protected]>
StevenBH · Nov 17, 2022 · 8890afe · 8890afe
2 parents b86081b + c4ecf75
commit 8890afe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/doc/_ext/ceph_releases.py b/doc/_ext/ceph_releases.py
@@ -191,7 +191,7 @@ def run(self):
 
 class CephTimeline(Directive):
     has_content = False
-    required_arguments = 4
+    required_arguments = 3
     optional_arguments = 0
     option_spec = {}
 

diff --git a/doc/releases/index.rst b/doc/releases/index.rst
@@ -23,7 +23,6 @@ security fixes.
 
    Quincy (v17.2.*) <quincy>
    Pacific (v16.2.*) <pacific>
-   Octopus (v15.2.*) <octopus>
 
 .. ceph_releases:: releases.yml current
 
@@ -40,6 +39,7 @@ receive bug fixes or backports).
    :maxdepth: 1
    :hidden:
 
+   Octopus (v15.2.*) <octopus>
    Nautilus (v14.2.*) <nautilus>
    Mimic (v13.2.*) <mimic>
    Luminous (v12.2.*) <luminous>
@@ -58,8 +58,8 @@ receive bug fixes or backports).
 Release timeline
 ----------------
 
-.. ceph_timeline_gantt:: releases.yml quincy pacific octopus
-.. ceph_timeline:: releases.yml quincy pacific octopus
+.. ceph_timeline_gantt:: releases.yml quincy pacific
+.. ceph_timeline:: releases.yml quincy pacific
 
 .. _Quincy: quincy
 .. _17.2.0: quincy#v17-2-0-quincy

diff --git a/doc/releases/releases.yml b/doc/releases/releases.yml
@@ -56,6 +56,7 @@ releases:
 
   octopus:
     target_eol: 2022-06-01
+    actual_eol: 2022-08-09
     releases:
       - version: 15.2.17
         released: 2022-08-09