From f0776e0cfb77e346a0f36db761c99cb02f6b1998 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Mon, 15 Apr 2019 06:43:57 -0700
Subject: [PATCH] Remove python3.5 jobs for Train

The TC has decided that python 3.5 tests are not required for Train
forward[1]. This patch removes the python 3.5 jobs from Octavia.

[1] http://lists.openstack.org/pipermail/openstack-discuss/2019-April/ \
    005097.html

Change-Id: Ic75cb45f7c89a80b779ade18a9e4a6f7bf1a6847
---
 setup.cfg            |  2 +-
 tox.ini              | 12 ++----------
 zuul.d/projects.yaml | 15 ---------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 93073fdd7b..2afcd9fe8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,7 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index bde7082220..b8dfc2db5c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = docs,py35,py27,functional,pep8,specs
+minversion = 2.5.0
+envlist = docs,py36,py27,functional,pep8,specs
 skipsdist = True
 
 [testenv]
@@ -49,10 +49,6 @@ commands =
 [testenv:functional]
 setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
 
-[testenv:functional-py35]
-basepython = python3.5
-setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
-
 [testenv:functional-py36]
 basepython = python3.6
 setenv = OS_TEST_PATH={toxinidir}/octavia/tests/functional
@@ -65,10 +61,6 @@ commands = oslo_debug_helper {posargs}
 basepython = python2.7
 commands = oslo_debug_helper {posargs}
 
-[testenv:debug-py35]
-basepython = python3.5
-commands = oslo_debug_helper {posargs}
-
 [testenv:pep8]
 basepython = python3
 commands = flake8
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 99a972ebe2..87c6ab9a51 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -7,7 +7,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
@@ -26,13 +25,6 @@
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-        - openstack-tox-functional-py35:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
         - openstack-tox-functional-py36:
             irrelevant-files:
               - ^.*\.rst$
@@ -83,13 +75,6 @@
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-        - openstack-tox-functional-py35:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
         - openstack-tox-functional-py36:
             irrelevant-files:
               - ^.*\.rst$