From c7e61090577c1ac86fcab9650bdf7e4dc72fa36a Mon Sep 17 00:00:00 2001
From: saito-hideki <saito@fgrep.org>
Date: Mon, 29 Sep 2025 09:43:21 +0900
Subject: [PATCH] Ignore pylint errors caused by compatibility checks for six

* This is a temporary measure until we stop covering Python2
* Removng standalone ansible-lint tests since it is covered by ansible-test
* Fixing some typos

Signed-off-by: saito-hideki <saito@fgrep.org>
---
 .ansible-lint                                   |  2 +-
 .azure-pipelines/azure-pipelines.yml            | 16 ++++------------
 changelogs/fragments/682_update_ci_20250929.yml |  3 +++
 tests/sanity/ignore-2.20.txt                    |  9 +++++++++
 tests/utils/shippable/lint.sh                   | 14 --------------
 5 files changed, 17 insertions(+), 27 deletions(-)
 create mode 100644 changelogs/fragments/682_update_ci_20250929.yml
 delete mode 100755 tests/utils/shippable/lint.sh

diff --git a/.ansible-lint b/.ansible-lint
index 7f470fa..f437fd5 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -4,7 +4,7 @@
 # SPDX-FileCopyrightText: 2024, Ansible Project
 
 skip_list:
-  - meta-runtime[unsupported-version]  # Tis rule doesn't make any sense
+  - meta-runtime[unsupported-version]  # This rule doesn't make any sense
   - fqcn[deep]  # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
 exclude_paths:
   - changelogs/
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index cc2d866..544377e 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -55,10 +55,8 @@ stages:
               test: sanity
             - name: Units
               test: units
-            - name: Lint
-              test: lint
   - stage: Sanity_2_19
-    displayName: Ansible 2.19 sanitay & Units & Lint
+    displayName: Ansible 2.19 Sanity & Units
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -70,10 +68,8 @@ stages:
               test: sanity
             - name: Units
               test: units
-            - name: Lint
-              test: lint
   - stage: Sanity_2_18
-    displayName: Ansible 2.18 sanity & Units & Lint
+    displayName: Ansible 2.18 Sanity & Units
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -85,10 +81,8 @@ stages:
               test: sanity
             - name: Units
               test: units
-            - name: Lint
-              test: lint
   - stage: Sanity_2_17
-    displayName: Ansible 2.17 sanity & Units & Lint
+    displayName: Ansible 2.17 Sanity & Units
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
@@ -100,10 +94,8 @@ stages:
               test: sanity
             - name: Units
               test: units
-            - name: Lint
-              test: lint
   - stage: Sanity_2_16
-    displayName: Ansible 2.16 sanity & Units & Lint
+    displayName: Ansible 2.16 Sanity & Units
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
diff --git a/changelogs/fragments/682_update_ci_20250929.yml b/changelogs/fragments/682_update_ci_20250929.yml
new file mode 100644
index 0000000..d0e3dcf
--- /dev/null
+++ b/changelogs/fragments/682_update_ci_20250929.yml
@@ -0,0 +1,3 @@
+trivial:
+  - Updatng AZP CI matrix to ignore ansible-bad-import-from on six(https://github.com/ansible-collections/ansible.posix/pull/682).
+  - Removing sandalone ansible-lint test it already covered by ansible-test.
diff --git a/tests/sanity/ignore-2.20.txt b/tests/sanity/ignore-2.20.txt
index 3cf68c0..9b5e162 100644
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
@@ -1 +1,10 @@
 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
diff --git a/tests/utils/shippable/lint.sh b/tests/utils/shippable/lint.sh
deleted file mode 100755
index 6ab1187..0000000
--- a/tests/utils/shippable/lint.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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