From b04304094fb7de57cd3f1196a9907e2df4d1a369 Mon Sep 17 00:00:00 2001
From: "anthony.bellino" <ab2434@att.com>
Date: Mon, 17 May 2021 09:31:51 -0700
Subject: [PATCH] Gate Fixes for Drydock

* pep8 fixes for airship-drydock-omni-test
* Install requirements sequential for ubuntu_xenial image
* Install older version of pip<21.0 for ubuntu_xenial image

Change-Id: If494b6abc1f8b85d96da4cad2da8606b8b2a1352
---
 images/drydock/Dockerfile.ubuntu_xenial | 6 +++---
 python/requirements-lock.txt            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/images/drydock/Dockerfile.ubuntu_xenial b/images/drydock/Dockerfile.ubuntu_xenial
index f0ac6566..73e72c62 100644
--- a/images/drydock/Dockerfile.ubuntu_xenial
+++ b/images/drydock/Dockerfile.ubuntu_xenial
@@ -92,10 +92,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib
 COPY --from=baclient_builder /usr/local/lib /usr/local/lib
 COPY --from=baclient_builder /usr/local/include/yaml.h /usr/local/include/yaml.h
 
+RUN python3 -m pip install -U 'pip<21.0'
 COPY ./python/requirements-lock.txt /tmp/drydock/
-RUN pip3 install \
-    --no-cache-dir \
-    -r /tmp/drydock/requirements-lock.txt
+RUN cat /tmp/drydock/requirements-lock.txt | xargs -d '\n' \
+    -l1 pip3 -vv install --no-cache-dir
 
 COPY ./python /tmp/drydock/python
 WORKDIR /tmp/drydock/python
diff --git a/python/requirements-lock.txt b/python/requirements-lock.txt
index 863fda28..e2b83120 100644
--- a/python/requirements-lock.txt
+++ b/python/requirements-lock.txt
@@ -1,5 +1,5 @@
 alembic==0.8.2
-amqp==2.3.2
+amqp==2.6.0
 Babel==2.6.0
 Beaker==1.9.1
 cachetools==2.1.0
@@ -65,7 +65,7 @@ PyYAML==5.3.1
 redfish==2.0.1
 repoze.lru==0.7
 requests==2.22.0
-rfc3986==1.1.0
+rfc3986==1.2.0
 Routes==2.4.1
 setuptools==40.4.3
 six==1.15.0