Skip to content

Commit

Permalink
don't lint as part of the molecule run
Browse files Browse the repository at this point in the history
we have a dedicated step for linting in CI and as we use older molecule
on certain targets, it limits the linter version, which yields bad
results
  • Loading branch information
evgeni authored and ehelms committed Apr 10, 2024
1 parent 03195d9 commit 8f9da04
Show file tree
Hide file tree
Showing 12 changed files with 2 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Install dependencies
run: make test-setup
- name: Install Ansible 2.9 compatible molecule and Jinja
run: pip install --upgrade 'molecule[docker,lint]<4.0' 'Jinja2<3.1'
run: pip install --upgrade 'molecule[docker]<4.0' 'Jinja2<3.1'
if: matrix.ansible == 'v2.9.17'
- name: Run tests
env:
Expand Down
4 changes: 1 addition & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ cryptography<3.1; python_version < '3.6'
pylint==2.6.0; python_version >= '3.6'
voluptuous==0.12.1 # from https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt
yamllint
molecule[docker,lint]
molecule[docker]
molecule-plugins[docker]; python_version >= '3.9'
ansible-compat<4; python_version >= '3.6' # https://github.com/ansible-community/molecule/issues/3903
ansible-lint; python_version >= '3.9'
ansible-lint<6.12.0; python_version < '3.9'
4 changes: 0 additions & 4 deletions roles/backup/molecule/debian/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/backup/molecule/redhat/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/foreman_repositories/molecule/debian/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/foreman_repositories/molecule/redhat/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/installer/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/metrics/molecule/debian/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/metrics/molecule/redhat/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/puppet_repositories/molecule/debian/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
4 changes: 0 additions & 4 deletions roles/puppet_repositories/molecule/redhat/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ provisioner:
name: ansible
verifier:
name: ansible
lint: |
set -e
yamllint -c ../../.yamllint .
YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .

0 comments on commit 8f9da04

Please sign in to comment.