Skip to content

Commit 74b0ad7

Browse files
committed
#41 Remove unsupported linting config for v3 support
1 parent 0d7a3f2 commit 74b0ad7

File tree

3 files changed

+4
-38
lines changed

3 files changed

+4
-38
lines changed
+1-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
---
2-
scenario:
3-
name: aws-ec2-ubuntu
4-
52
driver:
63
name: ec2
4+
75
platforms:
86
- name: aws-ec2-ubuntu
97
image: ami-009c174642dba28e4
@@ -12,25 +10,16 @@ platforms:
1210

1311
provisioner:
1412
name: ansible
15-
lint:
16-
name: ansible-lint
17-
enabled: false
1813
playbooks:
1914
converge: ../playbook.yml
2015

21-
lint:
22-
name: yamllint
23-
enabled: false
24-
2516
verifier:
2617
name: testinfra
2718
directory: ../tests/
2819
env:
2920
# get rid of the DeprecationWarning messages of third-party libs,
3021
# see https://docs.pytest.org/en/latest/warnings.html#deprecationwarning-and-pendingdeprecationwarning
3122
PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
32-
lint:
33-
name: flake8
3423
options:
3524
# show which tests where executed in test output
3625
v: 1

docker/molecule/default/molecule.yml

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,24 @@
1-
---
2-
scenario:
3-
# default scenario is Docker
4-
name: default
5-
61
driver:
72
name: docker
3+
84
platforms:
95
- name: docker-ubuntu
106
image: ubuntu:bionic
117
privileged: true
128

139
provisioner:
1410
name: ansible
15-
lint:
16-
name: ansible-lint
17-
enabled: false
1811
playbooks:
1912
prepare: prepare-docker-in-docker.yml
2013
converge: ../playbook.yml
2114

22-
lint:
23-
name: yamllint
24-
enabled: false
25-
2615
verifier:
2716
name: testinfra
2817
directory: ../tests/
2918
env:
3019
# get rid of the DeprecationWarning messages of third-party libs,
3120
# see https://docs.pytest.org/en/latest/warnings.html#deprecationwarning-and-pendingdeprecationwarning
3221
PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
33-
lint:
34-
name: flake8
3522
options:
3623
# show which tests where executed in test output
37-
v: 1
24+
v: 1
+1-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
2-
scenario:
3-
name: vagrant-ubuntu
4-
52
driver:
63
name: vagrant
74
provider:
85
name: virtualbox
6+
97
platforms:
108
- name: vagrant-ubuntu
119
box: ubuntu/bionic64
@@ -16,24 +14,16 @@ platforms:
1614

1715
provisioner:
1816
name: ansible
19-
lint:
20-
name: ansible-lint
21-
enabled: false
2217
playbooks:
2318
converge: ../playbook.yml
2419

25-
lint:
26-
name: yamllint
27-
enabled: false
2820
verifier:
2921
name: testinfra
3022
directory: ../tests/
3123
env:
3224
# get rid of the DeprecationWarning messages of third-party libs,
3325
# see https://docs.pytest.org/en/latest/warnings.html#deprecationwarning-and-pendingdeprecationwarning
3426
PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
35-
lint:
36-
name: flake8
3727
options:
3828
# show which tests where executed in test output
3929
v: 1

0 commit comments

Comments
 (0)