From 3aa4e3ec85fb6d8686bdadcb455817bb3b80543e Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Wed, 27 May 2020 13:16:55 -0700
Subject: [PATCH] Remove swift-dsvm-functional-py3 job

Following https://github.com/openstack/devstack/commit/6b6bdc711,
the swift-dsvm-functional job has been running everything under
Python 3 anyway.

Change-Id: Ie285f513e1ed71dbaf4e12fe747ea6087664f843
---
 .zuul.yaml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 98b6d6711a..e9c7d159ac 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -241,10 +241,6 @@
       # This tox env get run twice; once for Keystone and once for tempauth
       tox_envlist: func
       devstack_localrc:
-        # Other services are fine to run py3
-        USE_PYTHON3: true
-        # explicitly state that we want to test swift under py2
-        DISABLED_PYTHON3_PACKAGES: 'swift'
         SWIFT_HASH: changeme
         # We don't need multiple replicas to run purely functional tests.
         # In fact, devstack special cases some things when there's only
@@ -263,20 +259,6 @@
     run: tools/playbooks/dsvm/run.yaml
     post-run: tools/playbooks/dsvm/post.yaml
 
-- job:
-    name: swift-dsvm-functional-py3
-    parent: swift-dsvm-functional
-    description: |
-      Setup a Swift/Keystone environment under py3 and run Swift's func tests
-      (also under py3).
-    vars:
-      # This tox env get run twice; once for Keystone and once for tempauth
-      tox_envlist: func-py3
-      devstack_localrc:
-        USE_PYTHON3: true
-        # explicitly clear swift's default-disabled status
-        DISABLED_PYTHON3_PACKAGES: ''
-
 - job:
     name: swift-dsvm-functional-ipv6
     parent: swift-dsvm-functional
@@ -608,11 +590,6 @@
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-dsvm-functional-py3:
-            irrelevant-files:
-              - ^(api-ref|doc|releasenotes)/.*$
-              - ^test/probe/.*$
-              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
         - swift-dsvm-functional-ipv6:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
@@ -683,11 +660,6 @@
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-dsvm-functional-py3:
-            irrelevant-files:
-              - ^(api-ref|doc|releasenotes)/.*$
-              - ^test/probe/.*$
-              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
         - swift-dsvm-functional-ipv6:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$