From 483838cecaf2c1abd371a92a68e7f6def6545598 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 21 Sep 2021 17:22:04 +0000
Subject: [PATCH] Deprecate EOL Python releases and OS versions

Update the deprecation policy to indicate that zuul-jobs is no
longer tested with EOL platforms. Also explicitly switch the minimum
Python 3 documented to 3.6, and add a note to the tox-py34 and
tox-py35 jobs mentioning that they're no longer directly tested.
Move those jobs to the deprecated jobs list as well, to help
reinforce the point that their continued use is not recommended.

Change-Id: I2edbf8ea010caf7a7641e0d88f360965fc0b96ab
---
 doc/source/deprecated-jobs.rst |  2 ++
 doc/source/policy.rst          | 12 +++++++++++-
 doc/source/python-jobs.rst     |  2 --
 zuul.d/python-jobs.yaml        |  8 ++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/doc/source/deprecated-jobs.rst b/doc/source/deprecated-jobs.rst
index 69a578a8d..4d6a60ed1 100644
--- a/doc/source/deprecated-jobs.rst
+++ b/doc/source/deprecated-jobs.rst
@@ -8,3 +8,5 @@ Deprecated Jobs
 .. zuul:autojob:: nodejs-npm-run-test
 .. zuul:autojob:: nodejs-npm-run-lint
 .. zuul:autojob:: nodejs-npm-run-docs
+.. zuul:autojob:: tox-py34
+.. zuul:autojob:: tox-py35
diff --git a/doc/source/policy.rst b/doc/source/policy.rst
index 5cd809cc6..0d375d33b 100644
--- a/doc/source/policy.rst
+++ b/doc/source/policy.rst
@@ -40,10 +40,20 @@ Before deprecating a feature in Zuul which is used by `zuul-jobs`, the
 usage of the feature must be removed from `zuul-jobs` according to the
 deprecation policy described above.
 
+Deprecated Operating Systems
+****************************
+
+Once an operating system version is no longer available with standard
+support from its supplier, the zuul-jobs collection will not make any
+significant effort to test future job or role changes for regressions
+on that platform. Conditional checks in playbooks and roles for these
+versions may be retained when possible, but should not come with any
+expectation of stability since they can no longer be tested reliably.
+
 Python Version Policy
 ---------------------
 
-``zuul-jobs`` targets Python 2.7 onwards and Python 3.5 onwards (note
+``zuul-jobs`` targets Python 2.7 onwards and Python 3.6 onwards (note
 this differs slightly from Ansible upstream, where the policy is 2.6
 onwards unless libraries depend on newer features.  `zuul-jobs` does
 not support Python 2.6).
diff --git a/doc/source/python-jobs.rst b/doc/source/python-jobs.rst
index 3e210342a..805d9783b 100644
--- a/doc/source/python-jobs.rst
+++ b/doc/source/python-jobs.rst
@@ -3,8 +3,6 @@ Python Jobs
 
 .. zuul:autojob:: tox
 .. zuul:autojob:: tox-py27
-.. zuul:autojob:: tox-py34
-.. zuul:autojob:: tox-py35
 .. zuul:autojob:: tox-py36
 .. zuul:autojob:: tox-py37
 .. zuul:autojob:: tox-py38
diff --git a/zuul.d/python-jobs.yaml b/zuul.d/python-jobs.yaml
index 9d3ab34f3..46795e54b 100644
--- a/zuul.d/python-jobs.yaml
+++ b/zuul.d/python-jobs.yaml
@@ -65,6 +65,10 @@
       Run unit tests for a Python project under cPython version 3.4.
 
       Uses tox with the ``py34`` environment.
+
+      Changes to the zuul-jobs collection are no longer regression tested with
+      Python 3.4, but this job definition is being retained for backward
+      compatibility.
     vars:
       tox_envlist: py34
       python_version: 3.4
@@ -76,6 +80,10 @@
       Run unit tests for a Python project under cPython version 3.5.
 
       Uses tox with the ``py35`` environment.
+
+      Changes to the zuul-jobs collection are no longer regression tested with
+      Python 3.5, but this job definition is being retained for backward
+      compatibility.
     vars:
       tox_envlist: py35
       python_version: 3.5