From f16892ea481082dfcdc8369092dacf9bac912704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Wed, 13 May 2020 16:58:15 +0200
Subject: [PATCH] Move jobs to py38

Change-Id: I5e7e3f84519770e39754338ea4968fa6cd3ee6f6
---
 .zuul.yaml | 34 +++++++++++++++++-----------------
 tox.ini    | 12 ++++--------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f7de7b2eb..67d727c99 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,29 +1,29 @@
 - job:
-    name: oslo.messaging-tox-py36-func-scenario01
-    parent: openstack-tox-py36
+    name: oslo.messaging-tox-py38-func-scenario01
+    parent: openstack-tox-py38
     vars:
-      tox_envlist: py36-func-scenario01
+      tox_envlist: py38-func-scenario01
       bindep_profile: rabbit
 
 - job:
-    name: oslo.messaging-tox-py36-func-scenario02
-    parent: openstack-tox-py36
+    name: oslo.messaging-tox-py38-func-scenario02
+    parent: openstack-tox-py38
     vars:
-      tox_envlist: py36-func-scenario02
+      tox_envlist: py38-func-scenario02
       bindep_profile: rabbit kafka amqp1
 
 - job:
-    name: oslo.messaging-tox-py36-func-scenario03
-    parent: openstack-tox-py36
+    name: oslo.messaging-tox-py38-func-scenario03
+    parent: openstack-tox-py38
     vars:
-      tox_envlist: py36-func-scenario03
+      tox_envlist: py38-func-scenario03
       bindep_profile: rabbit amqp1
 
 - job:
-    name: oslo.messaging-tox-py36-func-scenario04
-    parent: openstack-tox-py36
+    name: oslo.messaging-tox-py38-func-scenario04
+    parent: openstack-tox-py38
     vars:
-      tox_envlist: py36-func-scenario04
+      tox_envlist: py38-func-scenario04
       bindep_profile: kafka amqp1
 
 # Begin v3 native jobs
@@ -115,12 +115,12 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - oslo.messaging-tox-py36-func-scenario01
-        - oslo.messaging-tox-py36-func-scenario02:
+        - oslo.messaging-tox-py38-func-scenario01
+        - oslo.messaging-tox-py38-func-scenario02:
             voting: false
-        - oslo.messaging-tox-py36-func-scenario03:
+        - oslo.messaging-tox-py38-func-scenario03:
             voting: false
-        - oslo.messaging-tox-py36-func-scenario04:
+        - oslo.messaging-tox-py38-func-scenario04:
             voting: false
         - oslo.messaging-src-dsvm-full-rabbit
         - oslo.messaging-src-dsvm-full-amqp1-hybrid:
@@ -134,5 +134,5 @@
 
     gate:
       jobs:
-        - oslo.messaging-tox-py36-func-scenario01
+        - oslo.messaging-tox-py38-func-scenario01
         - oslo.messaging-src-dsvm-full-rabbit
diff --git a/tox.ini b/tox.ini
index bed65f9e5..3ac8c79f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,22 +54,19 @@ commands =
 # scenario03      amqp     rabbit
 # scenario04      amqp     kafka
 #
-[testenv:py36-func-scenario01]
-basepython = python3.6
+[testenv:py38-func-scenario01]
 setenv =
     {[testenv]setenv}
     SCENARIO=scenario01
 commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py36-func-scenario02]
-basepython = python3.6
+[testenv:py38-func-scenario02]
 setenv =
     {[testenv]setenv}
     SCENARIO=scenario02
 commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py36-func-scenario03]
-basepython = python3.6
+[testenv:py38-func-scenario03]
 setenv =
     {[testenv]setenv}
     SCENARIO=scenario03
@@ -77,8 +74,7 @@ setenv =
     WORKDIR={toxworkdir}
 commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py36-func-scenario04]
-basepython = python3.6
+[testenv:py38-func-scenario04]
 setenv =
     {[testenv]setenv}
     SCENARIO=scenario04