From c064de299200771bc01aa689376a239c2775f288 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 24 Nov 2021 17:23:06 -0600
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: I9fe6187ea8c849812a508b48b342226e50fca831
---
 .zuul.yaml | 2 +-
 setup.cfg  | 1 +
 tox.ini    | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4c61f5f4c42..47bd3cd8f91 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,7 +24,7 @@
               - ^contrib/block-box.*$
               - ^doc/.*$
               - ^releasenotes/.*$
-        - openstack-tox-functional-py38:
+        - openstack-tox-functional-py39:
             irrelevant-files: *functional-irrelevant-files
         - cinder-rally-task:
             voting: false
diff --git a/setup.cfg b/setup.cfg
index 212c24d482c..9b057ad5a40 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
 project_urls:
     Source=https://opendev.org/openstack/cinder
     Tracker=https://bugs.launchpad.net/cinder
diff --git a/tox.ini b/tox.ini
index 4491cf7344c..e68f6a6cf2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,6 +58,10 @@ setenv =
 setenv =
   {[testenv:functional]setenv}
 
+[testenv:functional-py39]
+setenv =
+  {[testenv:functional]setenv}
+
 [testenv:api-samples]
 envdir = {toxworkdir}/shared
 setenv =