Merge pull request freeipa#1120 from rjeffman/ci_fix_sanity_test_ansi…

…ble_lint upstream ci: fix sanity test ansible lint failures
rjeffman · Sep 7, 2023 · 7d9e4da · 7d9e4da
2 parents 0a20b59 + 3534fcd
commit 7d9e4da
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
           pip install "ansible-core >=2.15,<2.16" ansible-lint
           utils/build-galaxy-release.sh -ki
           cd .galaxy-build
-          ansible-lint
+          ansible-lint --profile production --exclude tests/integration/ --exclude tests/unit/ --parseable --nocolor
 
   yamllint:
     name: Verify yamllint

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,25 @@
 ---
 repos:
 - repo: https://github.com/ansible/ansible-lint.git
-  rev: v6.6.1
+  rev: v6.17.2
   hooks:
   - id: ansible-lint
     always_run: false
     pass_filenames: true
     files: \.(yaml|yml)$
     exclude: /env[^/]*.(yaml|yml)$
-    entry: |
-        env ANSIBLE_LIBRARY=./plugins/modules ANSIBLE_MODULE_UTILS=./plugins/module_utils ANSIBLE_DOC_FRAGMENT_PLUGINS=./plugins/doc_fragments ansible-lint
+    entry: >-
+        env
+        ANSIBLE_LIBRARY=./plugins/modules
+        ANSIBLE_MODULE_UTILS=./plugins/module_utils
+        ANSIBLE_DOC_FRAGMENT_PLUGINS=./plugins/doc_fragments
+        ansible-lint
+          --offline
+          --profile production
+          --exclude tests/integration/
+          --exclude tests/unit/
+          --parseable
+          --nocolor
 - repo: https://github.com/adrienverge/yamllint.git
   rev: v1.28.0
   hooks:

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,4 +7,4 @@ pylint==2.14.4
 wrapt == 1.14.0
 pydocstyle==6.0.0
 yamllint==1.28.0
-ansible-lint==6.6.1
+ansible-lint
diff --git a/tests/sanity/galaxy-importer.cfg b/tests/sanity/galaxy-importer.cfg
@@ -1,5 +1,5 @@
 [galaxy-importer]
 RUN_ANSIBLE_TEST = True
-RUN_ANSIBLE_LINT = True
+RUN_ANSIBLE_LINT = False
 ANSIBLE_TEST_LOCAL_IMAGE = True
 LOCAL_IMAGE_DOCKER = True
diff --git a/utils/lint_check.sh b/utils/lint_check.sh
@@ -26,7 +26,7 @@ playbook_dirs=(
     "tests"
     "playbooks"
 )
-ansible-lint --force-color "${playbook_dirs[@]}"
+ansible-lint --offline --profile production --exclude tests/integration/ --exclude tests/unit/ --parseable --force-color "${playbook_dirs[@]}"
 
 echo -e "${INFO}Running 'ansible-doc-test'...${RST}"
 python "${topdir}/ansible-doc-test" -v roles plugins