From 87858ab976160e08536b936bb7a3e1498d38c1d2 Mon Sep 17 00:00:00 2001 From: Jakob Meng Date: Mon, 21 Mar 2022 11:19:52 +0100 Subject: [PATCH] Fixed python packages in tox virtualenvs Reverted commit 031475d42e which changed tox_install_siblings to false in base job ansible-collections-openstack-functional-devstack. This caused most jobs to install the latest Python packages of OpenStack SDK and other requirements from PyPI to tox' virtualenv instead of respecting the override-checkout keywords. Ref.: https://opendev.org/openstack/ansible-collections-openstack/commit/031475d42e306808fa1beefdaaf615fa540662a4 Change-Id: Ide693ef95c613454e1cfb2ee1880793a49f6524e --- .zuul.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 48081ada..e5b9c226 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -25,7 +25,7 @@ vars: zuul_work_dir: src/opendev.org/openstack/ansible-collections-openstack tox_envlist: ansible - tox_install_siblings: false + tox_install_siblings: true fetch_subunit: false devstack_plugins: designate: https://opendev.org/openstack/designate @@ -48,8 +48,6 @@ pre-run: ci/playbooks/get_amphora_tarball.yaml required-projects: - openstack/octavia - - name: github.com/ansible/ansible - override-checkout: stable-2.12 files: - ^ci/roles/loadbalancer/.*$ - ^plugins/modules/lb_health_monitor.py @@ -59,7 +57,8 @@ - ^plugins/modules/loadbalancer.py vars: configure_swap_size: 8192 - tox_envlist: ansible + tox_envlist: ansible-2.12 + tox_install_siblings: false devstack_plugins: designate: https://opendev.org/openstack/designate octavia: https://opendev.org/openstack/octavia