From e1b341d9bee1b1d0a1b20eaa669896e0c10cace0 Mon Sep 17 00:00:00 2001
From: Yuriy Novostavskiy <yuriy@novostavskiy.kiev.ua>
Date: Thu, 6 Feb 2025 20:17:04 +0100
Subject: [PATCH] Cherry-pick to stable-3: Fix linters in CI (#873) (#877)

SUMMARY
It seems that recent updates in linters break CI. Closes #874 ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
CI
ADDITIONAL INFORMATION
It's cherry-pick #873 to stable-3 as patch bot failed
Reviewed-by: Mike Graves mgraves@redhat.com
Reviewed-by: Yuriy Novostavskiy

Reviewed-by: Mike Graves <mgraves@redhat.com>
---
 .ansible-lint-ignore                                      | 7 +++++++
 .config/ansible-lint-ignore.txt                           | 3 ---
 .gitignore                                                | 1 +
 .yamllint                                                 | 8 ++++++++
 tests/integration/targets/k8s_manifest_url/tasks/main.yml | 2 +-
 tests/integration/targets/lookup_kustomize/tasks/main.yml | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 .ansible-lint-ignore
 delete mode 100644 .config/ansible-lint-ignore.txt

diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore
new file mode 100644
index 00000000..6f93958d
--- /dev/null
+++ b/.ansible-lint-ignore
@@ -0,0 +1,7 @@
+# https://docs.ansible.com/ansible-lint/docs/rules/
+# no-changed-when is not requried for examples
+plugins/connection/kubectl.py no-changed-when
+# false positive result
+plugins/connection/kubectl.py var-naming[no-reserved]
+# stable-3 branch support ansible-core>=2.14.0
+meta/runtime.yml meta-runtime[unsupported-version]
diff --git a/.config/ansible-lint-ignore.txt b/.config/ansible-lint-ignore.txt
deleted file mode 100644
index 6decc8d8..00000000
--- a/.config/ansible-lint-ignore.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# no-changed-when is not requried for examples
-plugins/connection/kubectl.py no-changed-when
-meta/runtime.yml meta-runtime[unsupported-version]
diff --git a/.gitignore b/.gitignore
index 43300e50..c0d8df30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ changelogs/.plugin-cache.yaml
 tests/output
 tests/integration/cloud-config-*
 .cache
+.ansible
 
 # Helm charts
 tests/integration/*-chart-*.tgz
diff --git a/.yamllint b/.yamllint
index bc74eedb..5129559f 100644
--- a/.yamllint
+++ b/.yamllint
@@ -5,16 +5,24 @@ rules:
   braces:
     max-spaces-inside: 1
     level: error
+
   brackets:
     max-spaces-inside: 1
     level: error
+  comments:
+    min-spaces-from-content: 1
+  comments-indentation: false
   document-start: disable
   line-length: disable
   truthy: disable
   indentation:
     spaces: 2
     indent-sequences: consistent
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true
 ignore: |
   .cache
   .tox
+  .ansible
   tests/output
diff --git a/tests/integration/targets/k8s_manifest_url/tasks/main.yml b/tests/integration/targets/k8s_manifest_url/tasks/main.yml
index 1d767b61..f612733d 100644
--- a/tests/integration/targets/k8s_manifest_url/tasks/main.yml
+++ b/tests/integration/targets/k8s_manifest_url/tasks/main.yml
@@ -23,7 +23,7 @@
         - name: Update directory permissions
           file:
             path: "{{ manifests_dir.path }}"
-            mode: 0755
+            mode: '0755'
 
         - name: Create manifests files
           copy:
diff --git a/tests/integration/targets/lookup_kustomize/tasks/main.yml b/tests/integration/targets/lookup_kustomize/tasks/main.yml
index dafdcdd0..3e285868 100644
--- a/tests/integration/targets/lookup_kustomize/tasks/main.yml
+++ b/tests/integration/targets/lookup_kustomize/tasks/main.yml
@@ -45,7 +45,7 @@
     - name: make script as executable
       file:
         path: "{{ tmp_dir_path }}/install_kustomize.sh"
-        mode: 0755
+        mode: '0755'
 
     - name: Install kustomize
       command: "{{ tmp_dir_path }}/install_kustomize.sh"