From bef964cab2c44aec84daef83cb6296e9751db0e9 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 30 May 2022 18:53:34 -0500
Subject: [PATCH] [stable-only] Pin openstacksdk in
 openstacksdk-functional-devstack

openstacksdk-functional-devstack jobs use master constraints and
also supposed to be run on stable branches. But sometimes master
constraints does not match with the versions present in old nodeset
in stable branches. For example, new constraints of 'coverage' 6.4
 I80d5c5bc2f379a9bac41e4bb40594a253853ee12
broke this job run on stable/ussuri. If we are using the master
constraints then it can break anytime when new constraints which
are not compatible with old branch supported distro.

Pinning this job to use stable/ussuri openstacksdk and constraints.

This squash the lower-constraints job removal fix
- https://review.opendev.org/c/openstack/openstacksdk/+/844096

NOTE(elod.illes): python2 binary is not needed in ussuri, besides
causing errors with requirements-check job. So binary is replaced
to python3 versions.

Story: 2010057
Tasks: 45501

Co-authored-by: Elod Illes <elod.illes@est.tech>

Change-Id: I11d60e42a83122b0e53b1d436ed4beca22bce5d4
---
 .zuul.yaml            |  7 ++++---
 bindep.txt            |  4 ++--
 lower-constraints.txt | 45 -------------------------------------------
 tox.ini               |  7 -------
 4 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100644 lower-constraints.txt

diff --git a/.zuul.yaml b/.zuul.yaml
index b992a82d8..dfe6f6d44 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -36,10 +36,12 @@
       # make sure stable branches of openstacksdk never get cloned by other
       # people, since stable branches of openstacksdk are, well, not actually
       # things.
+      # Pinning it on stable/ussuri as current master constraints(zed cycle)
+      # are not compatible with packages available in supported distro version
+      # in stable/ussuri.
+      # details in https://storyboard.openstack.org/#!/story/2010057
       - name: openstack/openstacksdk
-        override-branch: master
       - name: openstack/os-client-config
-        override-branch: master
     timeout: 9000
     vars:
       devstack_localrc:
@@ -392,7 +394,6 @@
 - project:
     templates:
       - check-requirements
-      - openstack-lower-constraints-jobs
       - openstack-python35-jobs
       - openstack-python3-ussuri-jobs
       - openstacksdk-functional-tips
diff --git a/bindep.txt b/bindep.txt
index 104a48089..d2c0c385c 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -2,8 +2,8 @@
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 
 build-essential [platform:dpkg]
-python-dev [platform:dpkg]
-python-devel [platform:rpm]
+python3-dev [platform:dpkg]
+python3-devel [platform:rpm]
 libffi-dev [platform:dpkg]
 libffi-devel [platform:rpm]
 openssl-devel [platform:rpm]
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 1f491875d..000000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-appdirs==1.3.0
-coverage==4.0
-cryptography==2.1
-ddt==1.0.1
-decorator==4.4.1
-doc8==0.8.0
-dogpile.cache==0.6.5
-extras==1.0.0
-fixtures==3.0.0
-future==0.16.0
-futures==3.0.0
-ipaddress==1.0.17
-iso8601==0.1.11
-jmespath==0.9.0
-jsonpatch==1.16
-jsonpointer==1.13
-jsonschema==2.6.0
-keystoneauth1==3.18.0
-linecache2==1.0.0
-mock==3.0.0
-mox3==0.20.0
-munch==2.1.0
-netifaces==0.10.4
-os-client-config==1.28.0
-os-service-types==1.7.0
-oslo.config==6.1.0
-oslotest==3.2.0
-pbr==2.0.0
-prometheus-client==0.4.2
-Pygments==2.2.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-PyYAML==3.12
-requests==2.18.0
-requests-mock==1.2.0
-requestsexceptions==1.2.0
-six==1.10.0
-statsd==3.3.0
-stestr==1.0.0
-stevedore==1.20.0
-testrepository==0.0.18
-testscenarios==0.4
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
diff --git a/tox.ini b/tox.ini
index edc69a3fd..24f70abd9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -124,12 +124,5 @@ paths = ./openstack
 [doc8]
 extensions = .rst, .yaml
 
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-
 [testenv:py35]
 basepython = python3.5
-deps = {[testenv:lower-constraints]deps}