CI: Use upper constraints when installing clients

Clients are starting to release versions that don't support Python 2.
The ironic scenario is currently failing on stable branches for this
reason.

Use upper constraints to avoid installing these new versions on stable
branches.

Change-Id: I4f91b53cbf2297d70da4b54d6c402c1427aacdd9
This commit is contained in:
Mark Goddard 2020-02-25 10:22:27 +00:00
parent c00e1be43e
commit d8733b290e
3 changed files with 13 additions and 11 deletions

View File

@ -269,6 +269,7 @@
TAG: "{{ build_image_tag }}" TAG: "{{ build_image_tag }}"
KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/opendev.org/openstack/kolla" KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/opendev.org/openstack/kolla"
SCENARIO: "{{ scenario }}" SCENARIO: "{{ scenario }}"
UPPER_CONSTRAINTS: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
- name: Run init-swift.sh script - name: Run init-swift.sh script
script: script:

View File

@ -10,22 +10,22 @@ GIT_PROJECT_DIR=$(mktemp -d)
function setup_openstack_clients { function setup_openstack_clients {
# Prepare virtualenv for openstack deployment tests # Prepare virtualenv for openstack deployment tests
local packages=(python-openstackclient python-heatclient)
if [[ $SCENARIO == zun ]]; then
packages+=(python-zunclient)
fi
if [[ $SCENARIO == ironic ]]; then
packages+=(python-ironicclient)
fi
if [[ $SCENARIO == masakari ]]; then
packages+=(python-masakariclient)
fi
if [[ "debian" == $BASE_DISTRO ]]; then if [[ "debian" == $BASE_DISTRO ]]; then
sudo apt -y install python3-venv sudo apt -y install python3-venv
fi fi
python3 -m venv ~/openstackclient-venv python3 -m venv ~/openstackclient-venv
~/openstackclient-venv/bin/pip install -U pip ~/openstackclient-venv/bin/pip install -U pip
~/openstackclient-venv/bin/pip install python-openstackclient ~/openstackclient-venv/bin/pip install -c $UPPER_CONSTRAINTS ${packages[@]}
~/openstackclient-venv/bin/pip install python-heatclient
if [[ $SCENARIO == zun ]]; then
~/openstackclient-venv/bin/pip install python-zunclient
fi
if [[ $SCENARIO == ironic ]]; then
~/openstackclient-venv/bin/pip install python-ironicclient
fi
if [[ $SCENARIO == masakari ]]; then
~/openstackclient-venv/bin/pip install python-masakariclient
fi
} }
function setup_config { function setup_config {

View File

@ -8,6 +8,7 @@
timeout: 7200 timeout: 7200
required-projects: required-projects:
- openstack/kolla-ansible - openstack/kolla-ansible
- openstack/requirements
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.* - ^doc/.*