From 6afd886cdd25d1c761d80f6c43303a09187349d5 Mon Sep 17 00:00:00 2001
From: tushargite96 <tushargite96@gmail.com>
Date: Thu, 25 Nov 2021 12:35:17 +0530
Subject: [PATCH] Updating python testing as per Yoga testing runtime

Yoga testing runtime[1] has been updated to add py39
testing as voting and as we are testing py3.6 and py3.9
we do not need to test py3.7|8 explicitly. Unit tests update are
handled by the job template change in openstack-zuul-job

- https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/820286

this commit makes other required changes in zuul.yaml and
update the classifier in setup.cfg file.

[1] https://governance.openstack.org/tc/reference/runtimes/yoga.html

Change-Id: Ib5b93ca7863fcc0b6d00fb4d52a5f299d1903056
---
 .zuul.yaml | 11 ++++++-----
 setup.cfg  |  1 +
 tox.ini    |  7 +------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 6181f716a..c9e5b5087 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -30,11 +30,12 @@
       tox_envlist: functional-py36
 
 - job:
-    name: python-cinderclient-functional-py38
+    name: python-cinderclient-functional-py39
     parent: python-cinderclient-functional-base
+    nodeset: devstack-single-node-centos-9-stream
     vars:
-      python_version: 3.8
-      tox_envlist: functional-py38
+      python_version: 3.9
+      tox_envlist: functional-py39
 
 - project:
     templates:
@@ -47,10 +48,10 @@
     check:
       jobs:
         - python-cinderclient-functional-py36
-        - python-cinderclient-functional-py38
+        - python-cinderclient-functional-py39
         - openstack-tox-pylint:
             voting: false
     gate:
       jobs:
         - python-cinderclient-functional-py36
-        - python-cinderclient-functional-py38
+        - python-cinderclient-functional-py39
diff --git a/setup.cfg b/setup.cfg
index b54ff289e..7506b72c2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index d158bf462..dc8777c3a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -100,12 +100,7 @@ setenv = {[testenv:functional]setenv}
 passenv = {[testenv:functional]passenv}
 commands = {[testenv:functional]commands}
 
-[testenv:functional-py37]
-setenv = {[testenv:functional]setenv}
-passenv = {[testenv:functional]passenv}
-commands = {[testenv:functional]commands}
-
-[testenv:functional-py38]
+[testenv:functional-py39]
 setenv = {[testenv:functional]setenv}
 passenv = {[testenv:functional]passenv}
 commands = {[testenv:functional]commands}