Skip to content

Commit 29d1212

Browse files
committed
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. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Date: Tue Feb 9 10:03:48 2021 -0700 # # On branch molecule-v3-tox-lsr-2.1.2 # Changes to be committed: # modified: .github/workflows/tox.yml # modified: molecule/default/molecule.yml # # Untracked files: # vimlog #
1 parent 29f82bc commit 29d1212

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/tox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: tox
33
on: # yamllint disable-line rule:truthy
44
- pull_request
55
env:
6-
TOX_LSR: "git+https://github.com/linux-system-roles/tox-lsr@1.0.2"
6+
TOX_LSR: "git+https://github.com/linux-system-roles/tox-lsr@2.1.2"
77
LSR_ANSIBLES: 'ansible==2.8.* ansible==2.9.*'
88
LSR_MSCENARIOS: default
99
# LSR_EXTRA_PACKAGES: libdbus-1-dev

molecule/default/molecule.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
dependency:
44
name: galaxy
55
driver:
6-
name: docker
7-
lint:
8-
enabled: false
6+
name: ${LSR_MOLECULE_DRIVER:-docker}
97
platforms:
108
- name: centos-6
119
image: registry.centos.org/centos:6
@@ -28,8 +26,6 @@ platforms:
2826
provisioner:
2927
name: ansible
3028
log: true
31-
lint:
32-
enabled: false
3329
playbooks:
3430
converge: ../../tests/tests_default.yml
3531
scenario:

0 commit comments

Comments
 (0)