From c007e8b3138c312ef87ed42ecd7fac910b3195a7 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       | 33 ++++++++-------------------------
 requirements.txt |  1 -
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 886c7623da..937589588a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,7 +6,6 @@
       - openstack-python3-train-jobs
     check:
       jobs:
-        - vmware-tox-lower-constraints
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
@@ -16,7 +15,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-py27:
             timeout: 5400
@@ -28,7 +27,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
@@ -40,7 +39,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
@@ -52,12 +51,11 @@
               - openstack/neutron-fwaas
               - openstack/neutron-dynamic-routing
               - openstack/neutron-vpnaas
-              - x/tap-as-a-service
+              - openstack/tap-as-a-service
               - openstack/octavia
     gate:
       queue: vmware-nsx
       jobs:
-        - vmware-tox-lower-constraints
         - openstack-tox-pep8:
             required-projects:
               - openstack/neutron
@@ -67,7 +65,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-py27:
             timeout: 5400
@@ -79,7 +77,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
@@ -91,7 +89,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
@@ -103,20 +101,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 d78ad60e41..c54f6ab2dd 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.3.0 # BSD
 mock>=2.0.0 # BSD