From 2d55b124e11c739d781208ec97eb82742bc943fe Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Tue, 15 Dec 2020 19:25:02 -0700 Subject: [PATCH] ensure molecule runs on centos8 define the nodeset for tox-molecule jobs Closes-Bug: 1908328 Change-Id: Ie0aa4cca983d45c959611e0e93effb4b21a69488 --- roles/tripleo-repos/molecule/default/molecule.yml | 2 +- test-requirements.txt | 8 +++++--- zuul.d/base.yaml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/roles/tripleo-repos/molecule/default/molecule.yml b/roles/tripleo-repos/molecule/default/molecule.yml index 075eb837d..a33613179 100644 --- a/roles/tripleo-repos/molecule/default/molecule.yml +++ b/roles/tripleo-repos/molecule/default/molecule.yml @@ -2,7 +2,7 @@ # The MOLECULE_ vars used here are not officialy endorsed by molecule, but we # hope a future version will add implicit support for them. driver: - name: docker + name: containers log: true platforms: diff --git a/test-requirements.txt b/test-requirements.txt index c50b67ffe..bf0064b69 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,14 +1,16 @@ ansible<2.10 PyYAML ansi2html # GPL (soft-dependency of pytest-html) -docker>=3.7 # Apache -molecule>=3.0,<3.1 +molecule>=3.2.3,<3.3 +molecule-containers>=0.2.1 +molecule-docker +molecule-podman paramiko>=2.5.0 # LGPL (soft-dependency of docker that enables ssh protocol) pre-commit>=1.10 # MIT License pytest # MIT pytest-cov # MIT pytest-html # MPL 2.0 -pytest-molecule>=1.3.0,<1.3.1 # MIT (reference: https://launchpad.net/bugs/1900033) +pytest-molecule>=1.3.3,<1.4.0 # MIT (reference: https://launchpad.net/bugs/1900033) pytest-plus # MIT pytest-xdist # MIT requests diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 396c661ae..60cc0df14 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -658,6 +658,7 @@ failure-url: "tox/reports.html" vars: bindep_profile: test molecule + nodeset: single-centos-8-node required-projects: - opendev.org/openstack/tripleo-repos