From e109d52e773b5b920f5053dcd0fb8b5fc9f09c2b Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 9 Feb 2021 10:36:55 -0700 Subject: [PATCH] use molecule v3, drop v2 - use tox-lsr 2.1.2 Switch to molecule v3. This drops support for v2. This requires tox-lsr 2 or later. Upgrade to tox-lsr 2.1.2 to pick up fix for collection dependency on python six. Signed-off-by: Rich Megginson --- .github/workflows/tox.yml | 2 +- molecule/default/molecule.yml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index bb926cc..4e7064d 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -3,7 +3,7 @@ name: tox on: # yamllint disable-line rule:truthy - pull_request env: - TOX_LSR: "git+https://github.com/linux-system-roles/tox-lsr@1.0.2" + TOX_LSR: "git+https://github.com/linux-system-roles/tox-lsr@2.1.2" LSR_ANSIBLES: 'ansible==2.8.* ansible==2.9.*' LSR_MSCENARIOS: default # LSR_EXTRA_PACKAGES: "libdbus-1-dev libgirepository1.0-dev python3-dev" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 718bd12..91fc962 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,9 +3,7 @@ dependency: name: galaxy driver: - name: docker -lint: - enabled: false + name: ${LSR_MOLECULE_DRIVER:-docker} platforms: - name: centos-6 image: registry.centos.org/centos:6 @@ -28,8 +26,6 @@ platforms: provisioner: name: ansible log: true - lint: - enabled: false playbooks: converge: ../../tests/tests_default.yml scenario: