From 5d6ec316d636f730d630e637178f1806999ca423 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Tue, 26 Feb 2019 10:55:18 -0600
Subject: [PATCH] Drop py35 jobs

Python 3.5 was the target runtime for the Rocky release. The current
target py3 runtime for Stein is Python 3.6, so there is no reason to
keep testing against the older version.

https://governance.openstack.org/tc/reference/runtimes/stein.html#python-runtime-for-stein

Change-Id: If810570859e4c4a942f44097717170d5a0affbd0
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 .zuul.yaml | 6 +-----
 tox.ini    | 8 +-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a16aff5750b..28083cd5a23 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,6 @@
     templates:
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - publish-openstack-docs-pti
       - periodic-stable-jobs
@@ -15,7 +14,7 @@
         - cinder-tempest-dsvm-lvm-lio-barbican
         - cinder-tox-bandit-baseline:
             voting: false
-        - openstack-tox-functional-py35:
+        - openstack-tox-functional-py36:
             irrelevant-files: &functional-irrelevant-files
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -25,7 +24,6 @@
               - ^contrib/block-box.*$
               - ^doc/.*$
               - ^releasenotes/.*$
-        - openstack-tox-functional-py36
         - cinder-rally-task:
             voting: false
         - openstack-tox-pylint:
@@ -71,8 +69,6 @@
             irrelevant-files: *gate-irrelevant-files
     gate:
       jobs:
-        - openstack-tox-functional-py35:
-            irrelevant-files: *functional-irrelevant-files
         - legacy-grenade-dsvm-cinder-mn-sub-volbak:
             irrelevant-files: *gate-irrelevant-files
         - neutron-grenade:
diff --git a/tox.ini b/tox.ini
index 47d301b7cd0..aea85bd00bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 minversion = 2.0
 skipsdist = True
 skip_missing_interpreters = true
-envlist = py36,py35,py27,compliance,pep8
+envlist = py36,py27,compliance,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -53,12 +53,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 setenv =
   OS_TEST_PATH = ./cinder/tests/functional
 
-[testenv:functional-py35]
-basepython=
-    py35: python3.5
-setenv =
-  {[testenv:functional]setenv}
-
 [testenv:functional-py36]
 setenv =
   {[testenv:functional]setenv}