From 564a06551fce5a6004a1f394d2e9661063878f5d Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 1 Dec 2022 15:25:41 +0000 Subject: [PATCH] CI: Fix molecule job on Ubuntu Jammy OpenDev has changed the image used for tox jobs to Ubuntu Jammy 22.04. This broke molecule jobs, which started failing with: ImportError: cannot import name 'Iterable' from 'collections' This change updates requirements to bump molecule and pytest-metadata. It also removes molecule flake8 lint configuration, which is no longer supported. Change-Id: I751a458f7668f7917abaa662723221ac7e3752c8 --- ansible/roles/kolla-openstack/molecule/default/molecule.yml | 2 -- .../kolla-openstack/molecule/enable-everything/molecule.yml | 2 -- molecule-requirements.txt | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/roles/kolla-openstack/molecule/default/molecule.yml b/ansible/roles/kolla-openstack/molecule/default/molecule.yml index fdee75ea6..331c131d6 100644 --- a/ansible/roles/kolla-openstack/molecule/default/molecule.yml +++ b/ansible/roles/kolla-openstack/molecule/default/molecule.yml @@ -18,5 +18,3 @@ scenario: name: default verifier: name: testinfra - lint: - name: flake8 diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml index 634455c19..d090b7e6d 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml +++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml @@ -147,5 +147,3 @@ scenario: name: enable-everything verifier: name: testinfra - lint: - name: flake8 diff --git a/molecule-requirements.txt b/molecule-requirements.txt index 839177c3e..0980f44c6 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -4,9 +4,9 @@ ansible-lint>=3.0.0,<6.0.0,!=4.3.0 # MIT docker # Apache-2.0 -molecule<3.5.0 # MIT +molecule<4.1.0 # MIT molecule-docker # MIT -pytest-metadata<2 # MPL +pytest-metadata # MPL pytest-molecule # MIT pytest-testinfra yamllint # GPLv3