Merge 53788e60fa into 6da1331018

* This is a temporary measure until we stop covering Python2

Signed-off-by: saito-hideki <saito@fgrep.org>

.azure-pipelines/azure-pipelines.yml

@@ -55,8 +55,10 @@ stages:
               test: sanity
             - name: Units
               test: units
+            - name: Lint
+              test: lint
   - stage: Sanity_2_19
-    displayName: Ansible 2.19 Sanitay & Units
+    displayName: Ansible 2.19 sanitay & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -68,8 +70,10 @@ stages:
               test: sanity
             - name: Units
               test: units
+            - name: Lint
+              test: lint
   - stage: Sanity_2_18
-    displayName: Ansible 2.18 Sanity & Units
+    displayName: Ansible 2.18 sanity & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -81,8 +85,10 @@ stages:
               test: sanity
             - name: Units
               test: units
+            - name: Lint
+              test: lint
   - stage: Sanity_2_17
-    displayName: Ansible 2.17 Sanity & Units
+    displayName: Ansible 2.17 sanity & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -94,8 +100,10 @@ stages:
               test: sanity
             - name: Units
               test: units
+            - name: Lint
+              test: lint
   - stage: Sanity_2_16
-    displayName: Ansible 2.16 Sanity & Units
+    displayName: Ansible 2.16 sanity & Units & Lint
     dependsOn: []
     jobs:
       - template: templates/matrix.yml

changelogs/fragments/682_update_ci_20250929.yml

@@ -1,2 +0,0 @@
-trivial:
-  - Update AZP CI matrix to ignore ansible-bad-import-from on six(https://github.com/ansible-collections/ansible.posix/pull/682).

tests/sanity/ignore-2.20.txt

@@ -1,10 +1,4 @@
 tests/utils/shippable/timing.py shebang
-plugins/action/synchronize.py pylint:ansible-bad-import-from
-plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from
-plugins/modules/mount.py pylint:ansible-bad-import-from
-plugins/modules/sysctl.py pylint:ansible-bad-import-from
-plugins/shell/csh.py pylint:ansible-bad-import-from
-plugins/shell/fish.py pylint:ansible-bad-import-from
 tests/unit/mock/procenv.py pylint:ansible-bad-import-from
 tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from
 tests/unit/modules/conftest.py pylint:ansible-bad-import-from

tests/utils/shippable/lint.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -o pipefail -eux
+
+echo "${PATH/\~/${HOME}}"
+echo "${HOME}"
+command -v ansible
+
+pip install --upgrade --user pip
+pip install --upgrade --user ansible-lint
+
+PATH="${PATH/\~/${HOME}}" ansible-lint \
+                                    --exclude changelogs/ \
+                                    --profile=production

tests/utils/shippable/sanity.sh

@@ -18,4 +18,4 @@ fi
 
 # shellcheck disable=SC2086
 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
-    --docker --base-branch "${base_branch}" --allow-disabled
+    --docker --base-branch "${base_branch}" --allow-disabled --debug