From c87fbc07a3180201c6466f3571861ff1d63f7ce6 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Mon, 6 Feb 2023 21:36:29 +0100 Subject: [PATCH] Fix grenade job & pin pylint on stable/branches devstack_localrc is not used in grenade jobs, use grenade_devstack_localrc instead. pylint release 2.16.x adds new checkers, pin pylint to the previously used version. Change-Id: I012ac70d511906a7401f92a3112c931b271dbefa --- test-requirements.txt | 2 +- zuul.d/jobs.yaml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 051ebbdf3f..9fc15cb134 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD flake8-import-order==0.12 # LGPLv3 python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 -pylint>=2.5.3 # GPLv2 +pylint>=2.5.3,<=2.15.10 # GPLv2 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=2.2.0 # MIT testresources>=2.0.0 # Apache-2.0/BSD diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index d7d98080fe..fc847bb98b 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -39,10 +39,11 @@ - opendev.org/openstack/octavia-tempest-plugin - opendev.org/openstack/python-octaviaclient vars: - devstack_localrc: - DIB_LOCAL_ELEMENTS: openstack-ci-mirrors - LIBVIRT_TYPE: kvm - LIBVIRT_CPU_MODE: host-passthrough + grenade_devstack_localrc: + shared: + DIB_LOCAL_ELEMENTS: openstack-ci-mirrors + LIBVIRT_TYPE: kvm + LIBVIRT_CPU_MODE: host-passthrough devstack_local_conf: test-config: "$TEMPEST_CONFIG":