use tox-lsr 3.3.0 for ansible 2.17; add ansible-test ignore files for…

… 2.17
richm · May 31, 2024 · 482d9ef · 482d9ef
1 parent 2cf668f
commit 482d9ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/inventory/group_vars/active_roles.yml b/inventory/group_vars/active_roles.yml
@@ -53,4 +53,4 @@ lsr_namespace: fedora
 lsr_name: linux_system_roles
 lsr_role_namespace: linux_system_roles  # for ansible-lint
 gha_checkout_action: actions/checkout@v4
-tox_lsr_url: "git+https://github.com/linux-system-roles/tox-lsr@3.2.2"
+tox_lsr_url: "git+https://github.com/linux-system-roles/tox-lsr@3.3.0"
diff --git a/playbooks/templates/.github/workflows/changelog_to_tag.yml b/playbooks/templates/.github/workflows/changelog_to_tag.yml
@@ -71,7 +71,7 @@ jobs:
 
 {%- raw %}
       - name: Create tag
-        uses: mathieudutour/github-tag-action@v6.1
+        uses: mathieudutour/github-tag-action@v6.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           custom_tag: ${{ steps.tag.outputs.tagname }}

diff --git a/playbooks/update_files.yml b/playbooks/update_files.yml
@@ -201,6 +201,24 @@
                 fi
               done
 
+        - name: Create ignore file for ansible-test 2.17
+          shell:
+            chdir: "{{ git_dir }}"
+            cmd: |
+              set -euxo pipefail
+              if [ ! -f .sanity-ansible-ignore-2.17.txt ] && [ -f .sanity-ansible-ignore-2.16.txt ]; then
+                cp .sanity-ansible-ignore-2.16.txt .sanity-ansible-ignore-2.17.txt
+                # 2.17 does not support py27 or py36
+                sed -e '/compile-2.7/d' -e '/compile-3.6/d' -e '/import-2.7/d' -e '/import-3.6/d' -i .sanity-ansible-ignore-2.17.txt
+                # https://docs.ansible.com/ansible-core/2.17/dev_guide/testing/sanity/no-unicode-literals.html
+                sed -e '/no-unicode-literals/d' -i .sanity-ansible-ignore-2.17.txt
+                if [ -s .sanity-ansible-ignore-2.17.txt ]; then
+                  git add .sanity-ansible-ignore-2.17.txt
+                else
+                  rm .sanity-ansible-ignore-2.17.txt
+                fi
+              fi
+
         - name: Create git commit, PR
           changed_when: false
           shell: