From ddf27f3b4635c1a82573743b3f17424d9a5a0cd4 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <sorlando@vmware.com>
Date: Thu, 19 Aug 2021 14:37:16 -0700
Subject: [PATCH] Fix zuul config

- Adapt to namespace change for tap-as-a-service
- Remove tox-lower-constraints

Change-Id: Id602739a8b48fa35ba4cd2a98d9fb67539fc8cdc
---
 .zuul.yaml       | 35 +++++++++--------------------------
 requirements.txt |  1 -
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index a8241f4184..8140ed1856 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,7 +7,6 @@
       - openstack-cover-jobs
     check:
       jobs:
-        - vmware-tox-lower-constraints
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
@@ -17,7 +16,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py36:
             timeout: 5400
@@ -29,7 +28,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py37:
             timeout: 5400
@@ -41,7 +40,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py38:
             timeout: 5400
@@ -53,7 +52,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-cover:
             timeout: 5400
@@ -65,13 +64,12 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
             voting: false
     gate:
       queue: vmware-nsx
       jobs:
-        - vmware-tox-lower-constraints
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
@@ -81,7 +79,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py36:
             timeout: 5400
@@ -93,7 +91,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py37:
             timeout: 5400
@@ -105,7 +103,7 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
         - openstack-tox-py38:
             timeout: 5400
@@ -117,20 +115,5 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
-
-- job:
-    name: vmware-tox-lower-constraints
-    parent: openstack-tox-lower-constraints
-    timeout: 5400
-    required-projects:
-      - openstack/neutron
-      - x/networking-l2gw
-      - openstack/networking-sfc
-      - x/vmware-nsxlib
-      - openstack/neutron-fwaas
-      - openstack/neutron-dynamic-routing
-      - openstack/neutron-vpnaas
-      - x/tap-as-a-service
-      - openstack/octavia
diff --git a/requirements.txt b/requirements.txt
index 6788be72ab..e49c30d59e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,7 +27,6 @@ oslo.service>=1.31.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 oslo.vmware>=2.17.0 # Apache-2.0
 paramiko>=2.4.0 # LGPLv2.1+
-PrettyTable<0.8,>=0.7.2 # BSD
 tooz>=1.58.0 # Apache-2.0
 decorator>=4.4.1 # BSD
 mock>=2.0.0 # BSD