From df3f58903b704a3ab39f829f60fe11a40aae782c Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Wed, 9 Sep 2020 10:54:14 -0700
Subject: [PATCH] Fix the lower-constraints job for focal

The move to focal for the tox jobs has raised issues with package
versions supporting python 3.8.
This patch bumps the version for the following packages:
PyMySQL==0.8.0
pyroute2==0.5.13
SQLAlchemy==1.2.19
cffi==1.14.0
cryptography==3.0
pyOpenSSL==19.1.0
oslo.db==8.30
oslo.messaging==12.4.0

This patch makes the grenade job non-voting as there is a chain
of gate fix patches required to fully fix all of the issues.

Change-Id: I95cc182a2dbcb2ea872e822ce9372bf5d7df63bd
---
 lower-constraints.txt | 16 ++++++++--------
 requirements.txt      | 14 +++++++-------
 zuul.d/projects.yaml  |  3 ++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 61522d6167..380363bef6 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -12,7 +12,7 @@ beautifulsoup4==4.6.0
 cachetools==2.0.1
 castellan==0.16.0
 certifi==2018.1.18
-cffi==1.11.5
+cffi==1.14.0
 chardet==3.0.4
 click==6.7
 cliff==2.11.0
@@ -20,7 +20,7 @@ cmd2==0.8.1
 contextlib2==0.5.5
 cotyledon==1.3.0
 coverage==4.0
-cryptography==2.1
+cryptography==3.0
 decorator==4.2.1
 deprecation==2.0
 diskimage-builder==2.24.0
@@ -79,10 +79,10 @@ oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.19.2
-oslo.db==4.27.0
+oslo.db==8.3.0
 oslo.i18n==3.15.3
 oslo.log==3.36.0
-oslo.messaging==6.3.0
+oslo.messaging==12.4.0
 oslo.middleware==4.0.1
 oslo.policy==1.30.0
 oslo.reports==1.18.0
@@ -112,12 +112,12 @@ pyflakes==1.0.0
 Pygments==2.2.0
 pyinotify==0.9.6
 pylint==1.9.2
-PyMySQL==0.7.6
+PyMySQL==0.8.0
 PyNaCl==1.2.1
-pyOpenSSL==17.1.0
+pyOpenSSL==19.1.0
 pyparsing==2.2.0
 pyperclip==1.6.0
-pyroute2==0.4.21
+pyroute2==0.5.13
 python-barbicanclient==4.5.2
 python-dateutil==2.7.0
 python-editor==1.0.3
@@ -145,7 +145,7 @@ snowballstemmer==1.2.1
 Sphinx==2.0.0
 sphinxcontrib-svg2pdfconverter==0.1.0
 sphinxcontrib-websupport==1.0.1
-SQLAlchemy==1.0.10
+SQLAlchemy==1.2.19
 SQLAlchemy-Utils==0.30.11
 sqlalchemy-migrate==0.11.0
 sqlparse==0.2.4
diff --git a/requirements.txt b/requirements.txt
index fcbc03ff92..adf16a8455 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ alembic>=0.8.10 # MIT
 cotyledon>=1.3.0 # Apache-2.0
 pecan>=1.3.2 # BSD
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
+SQLAlchemy>=1.2.19 # MIT
 SQLAlchemy-Utils>=0.30.11
 futurist>=1.2.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
@@ -17,10 +17,10 @@ WebOb>=1.8.2 # MIT
 stevedore>=1.20.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
-oslo.db>=4.27.0 # Apache-2.0
+oslo.db>=8.3.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.messaging>=6.3.0 # Apache-2.0
+oslo.messaging>=12.4.0 # Apache-2.0
 oslo.middleware>=4.0.1 # Apache-2.0
 oslo.policy>=1.30.0 # Apache-2.0
 oslo.reports>=1.18.0 # Apache-2.0
@@ -29,12 +29,12 @@ oslo.upgradecheck>=0.1.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 pyasn1!=0.2.3,>=0.1.8 # BSD
 pyasn1-modules>=0.0.6 # BSD
-PyMySQL>=0.7.6 # MIT License
+PyMySQL>=0.8.0 # MIT License
 python-barbicanclient>=4.5.2 # Apache-2.0
 python-glanceclient>=2.8.0 # Apache-2.0
 python-novaclient>=9.1.0 # Apache-2.0
 python-cinderclient>=3.3.0 # Apache-2.0
-pyOpenSSL>=17.1.0 # Apache-2.0
+pyOpenSSL>=19.1.0 # Apache-2.0
 WSME>=0.8.0 # MIT
 Jinja2>=2.10 # BSD License (3 clause)
 taskflow>=4.1.0 # Apache-2.0
@@ -51,7 +51,7 @@ setproctitle>=1.1.10 # BSD
 #for the amphora api
 Flask!=0.11,>=0.10 # BSD
 netifaces>=0.10.4 # MIT
-cryptography>=2.1 # BSD/Apache-2.0
-pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
+cryptography>=3.0 # BSD/Apache-2.0
+pyroute2>=0.5.13;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
 gunicorn>=19.9.0 # MIT
 Werkzeug>=0.14.1 # BSD License
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 9cf56b92e5..9cad5365e1 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -46,6 +46,7 @@
               - ^tools/.*$
               - ^(test-|)requirements.txt$
               - ^tox.ini$
+            voting: false
         - octavia-v2-dsvm-cinder-amphora:
             irrelevant-files: *irrelevant-files
             voting: false
@@ -81,7 +82,7 @@
         - octavia-v2-dsvm-tls-barbican
         - octavia-v2-dsvm-spare-pool
         - octavia-v2-act-stdby-dsvm-scenario
-        - octavia-grenade
+#        - octavia-grenade
     periodic:
       jobs:
         - publish-openstack-octavia-amphora-image-bionic: