From 3bebbd385bcd2bd47c4fc0e351f4af72b1a320a3 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 15 Dec 2019 13:22:10 -0500
Subject: [PATCH] Remove extra python2 test jobs

Once these are not used elsewhere we can remove them here.

Change-Id: I1e3ec3a39a43f08bd932312a6dd4616f8a973b36
---
 .zuul.yaml | 19 -------------------
 tox.ini    |  3 +--
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 62da50b92..ed11daaae 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -172,15 +172,6 @@
         OPENSTACKSDK_HAS_SWIFT: 0
         OPENSTACKSDK_HAS_HEAT: 0
 
-- job:
-    name: openstacksdk-functional-devstack-python2
-    parent: openstacksdk-functional-devstack
-    description: |
-      Run openstacksdk functional tests using python2 against a master devstack
-    vars:
-      tox_environment:
-        OPENSTACKSDK_TOX_PYTHON: python2
-
 - job:
     name: openstacksdk-functional-devstack-tips
     parent: openstacksdk-functional-devstack
@@ -194,16 +185,6 @@
     vars:
       tox_install_siblings: true
 
-- job:
-    name: openstacksdk-functional-devstack-tips-python2
-    parent: openstacksdk-functional-devstack-tips
-    description: |
-      Run openstacksdk functional tests with tips of library dependencies using
-      python2 against a master devstack.
-    vars:
-      tox_environment:
-        OPENSTACKSDK_TOX_PYTHON: python2
-
 - job:
     name: openstacksdk-functional-devstack-magnum
     parent: openstacksdk-functional-devstack
diff --git a/tox.ini b/tox.ini
index ad333313a..db99c9573 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ ignore_basepython_conflict = True
 usedevelop = True
 install_command = pip install {opts} {packages}
 passenv = OS_* OPENSTACKSDK_*
-basepython = {env:OPENSTACKSDK_TOX_PYTHON:python3}
+basepython = python3
 setenv =
     VIRTUAL_ENV={envdir}
     LANG=en_US.UTF-8
@@ -74,7 +74,6 @@ commands =
 
 [testenv:ansible]
 # Need to pass some env vars for the Ansible playbooks
-basepython = {env:OPENSTACKSDK_TOX_PYTHON:python3}
 passenv = HOME USER ANSIBLE_VAR_*
 deps =
     {[testenv]deps}