CI: Move NFV reqs installation to where it belongs

This ought to fix #1864238 for the stable branches.

Adapted for Stein to make NFV jobs trigger.

Change-Id: I218905247a4a4003ecfc2c9ab3e47767bb5ab33e
Related-bug: #1864238
This commit is contained in:
Radosław Piliszek 2020-06-12 21:33:22 +02:00
parent f3ba8d5f23
commit 2e1ab6e607
3 changed files with 6 additions and 7 deletions

View File

@ -48,16 +48,10 @@ function test_heat {
openstack stack list
}
function install_requirements {
echo "TESTING: Install requirements"
pip install "python-tackerclient" "python-heatclient" "networking-sfc" "python-mistralclient" "python-barbicanclient"
}
function test_scenario_nfv_logged {
. /etc/kolla/admin-openrc.sh
. ~/openstackclient-venv/bin/activate
install_requirements
test_tacker
test_barbican
test_mistral

View File

@ -17,6 +17,9 @@ function setup_openstack_clients {
if [[ $ACTION == ironic ]]; then
packages+=(python-ironicclient)
fi
if [[ $SCENARIO == scenario_nfv ]]; then
packages+=(python-tackerclient python-barbicanclient python-mistralclient)
fi
virtualenv ~/openstackclient-venv
~/openstackclient-venv/bin/pip install -U pip
~/openstackclient-venv/bin/pip install -c $UPPER_CONSTRAINTS ${packages[@]}

View File

@ -26,7 +26,9 @@
- kolla-ansible-ubuntu-source-zun:
files: ^ansible\/roles\/(zun|kuryr)\/.*
- kolla-ansible-centos-source-scenario-nfv:
files: ^ansible\/roles\/(barbican|heat|mistral|redis|tacker)\/.*
files:
- ^ansible/roles/(barbican|heat|mistral|redis|tacker)/
- ^tests/test-scenario-nfv.sh
- kolla-ansible-centos-source-ironic
- kolla-ansible-centos-binary-ironic
- kolla-ansible-ubuntu-source-ironic