openstack/openstack-ansible-tests
Code Issues Proposed changes

Do not filter setuptools from upper-constraints

Browse Source 
This is now removed from openstack-ansible global-requirement-pins
[1] so there is no longer a conflict with the data in
upper-constraints. We use the version from u-c instead of the one
from global-requirement-pins.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_nova/+/840412
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_keystone/+/840413
Depends-On: https://review.opendev.org/783720
Change-Id: I56305216a23b29a4a16fdd7b0658839a295d2f7c
This commit is contained in:
Jonathan Rosser 2021-03-29 22:20:30 +01:00
parent 3458ee0ee1
commit 2bd4e501a5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test-ansible-env-prep.sh
View File

@ -180,10 +180,9 @@ else
wget "${TOX_CONSTRAINTS_FILE:-https://opendev.org/openstack/requirements/raw/${TESTING_BRANCH}/upper-constraints.txt}" -O /tmp/upper-constraints.txt wget "${TOX_CONSTRAINTS_FILE:-https://opendev.org/openstack/requirements/raw/${TESTING_BRANCH}/upper-constraints.txt}" -O /tmp/upper-constraints.txt
fi fi
# Filter out setuptools/pip/wheel from OpenStack upper constraints # Filter out pip/wheel from OpenStack upper constraints
# These are already constrained in OSA global-requirement-pins.txt # These are already constrained in OSA global-requirement-pins.txt
cp /tmp/upper-constraints.txt /tmp/upper-constraints-filtered.txt cp /tmp/upper-constraints.txt /tmp/upper-constraints-filtered.txt
sed -i '/setuptools=/d' /tmp/upper-constraints-filtered.txt
sed -i '/pip=/d' /tmp/upper-constraints-filtered.txt sed -i '/pip=/d' /tmp/upper-constraints-filtered.txt
sed -i '/wheel=/d' /tmp/upper-constraints-filtered.txt sed -i '/wheel=/d' /tmp/upper-constraints-filtered.txt