From 6321f01f0cf9edb0df477bb9b785adf96440047f Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 15 Apr 2019 03:00:12 +0000
Subject: [PATCH] Dropping the py35 testing

All the integration testing has been moved to
Bionic now[1] and py3.5 is not tested runtime for
Train or stable/stein[2].

As per below ML thread, we are good to drop the py35
testing now:
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/005097.html

[1] http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004647.html
[2]
https://governance.openstack.org/tc/reference/runtimes/stein.html
https://governance.openstack.org/tc/reference/runtimes/train.html

Change-Id: Ia1289f038b92c36dbdd79bcdf12d7cb95a3e5aa9
Signed-off-by: zhangyangyang <zhangyangyang@unionpay.com>
---
 .zuul.yaml | 25 ++++---------------------
 setup.cfg  |  2 +-
 tox.ini    | 19 ++++---------------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 016bc55807..418f22e5a6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -60,21 +60,6 @@
       tox_install_siblings: true
     timeout: 3600
 
-- job:
-    name: nova-tox-functional-py35
-    parent: openstack-tox-functional-py35
-    description: |
-      Run tox-based functional tests for the OpenStack Nova project
-      under cPython version 3.5. with Nova specific irrelevant-files list.
-      Uses tox with the ``functional-py35`` environment.
-    required-projects:
-      - openstack/placement
-    irrelevant-files: *functional-irrelevant-files
-    vars:
-      tox_envlist: functional-py35
-      tox_install_siblings: true
-    timeout: 3600
-
 - job:
     name: nova-tox-functional-py36
     parent: openstack-tox
@@ -240,7 +225,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - periodic-stable-jobs
@@ -270,7 +254,7 @@
         - nova-lvm
         - nova-next
         - nova-tox-functional
-        - nova-tox-functional-py35
+        - nova-tox-functional-py36
         - tempest-full-py3:
             irrelevant-files: *dsvm-irrelevant-files
         - tempest-slow-py3:
@@ -282,7 +266,7 @@
         - nova-grenade-live-migration
         - nova-live-migration
         - nova-tox-functional
-        - nova-tox-functional-py35
+        - nova-tox-functional-py36
         - nova-next
         - tempest-full-py3:
             irrelevant-files: *dsvm-irrelevant-files
@@ -321,7 +305,6 @@
             irrelevant-files: *dsvm-irrelevant-files
         - os-vif-ovs:
             irrelevant-files: *dsvm-irrelevant-files
-        # NOTE(mriedem): Consider moving nova-tox-functional-py36 to the
-        # check and gate queues once it's stable (like openstack-python36-jobs)
-        - nova-tox-functional-py36
+        # NOTE(mriedem): Consider moving nova-tox-functional-py37 to the
+        # check and gate queues once it's stable (like openstack-python37-jobs)
         - nova-tox-functional-py37
diff --git a/setup.cfg b/setup.cfg
index 27ee214868..c881524ba0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [global]
 setup-hooks =
diff --git a/tox.ini b/tox.ini
index 1ae91fd5e5..b7d20e3f11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py{27,35},functional,pep8
+envlist = py{27,36,37},functional,pep8
 # Automatic envs (pyXX) will use the python version appropriate to that
 # env and ignore basepython inherited from [testenv]. That's what we
 # want, and we don't need to be warned about it.
@@ -37,18 +37,14 @@ commands =
   env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
   stestr slowest
 
-[testenv:py35]
+[testenv:py36]
 commands =
   stestr run {posargs}
   env TEST_OSPROFILER=1 stestr run --combine --no-discover 'nova.tests.unit.test_profiler'
 
-[testenv:py36]
-commands =
-  {[testenv:py35]commands}
-
 [testenv:py37]
 commands =
-  {[testenv:py35]commands}
+  {[testenv:py36]commands}
 
 [testenv:pep8]
 description =
@@ -101,14 +97,7 @@ commands =
   stestr slowest
 
 # TODO(gcb) Merge this into [testenv:functional] when functional tests are gating
-# with python 3.5
-[testenv:functional-py35]
-basepython = python3.5
-setenv = {[testenv]setenv}
-deps = {[testenv:functional]deps}
-commands =
-  {[testenv:functional]commands}
-
+# with python 3
 [testenv:functional-py36]
 basepython = python3.6
 setenv = {[testenv]setenv}