From 1bc98d2ee8dafe1bdea078a6e9f386e9426d4e42 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 10 Jan 2022 11:34:57 -0800
Subject: [PATCH] Update ansible-lint to fix deps problem

Older ansible-lint has an uncapped dep on 'rich' and newer rich breaks
ansible-lint. New ansible-lint has addressed this. We update
ansible-lint to get those fixes.

This adds task names to a number of tasks to correct a linting error.

Change-Id: I38284fef54213e0fceb1b348d5839129cc15148e
---
 roles/build-pdf-docs/tasks/main.yaml | 3 ++-
 roles/configure-swap/tasks/main.yaml | 3 ++-
 roles/configure-swap/tasks/root.yaml | 6 ++++--
 test-requirements.txt                | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/roles/build-pdf-docs/tasks/main.yaml b/roles/build-pdf-docs/tasks/main.yaml
index b646f18b..c719f698 100644
--- a/roles/build-pdf-docs/tasks/main.yaml
+++ b/roles/build-pdf-docs/tasks/main.yaml
@@ -4,7 +4,8 @@
   register: pdfdocs_env
   ignore_errors: yes
 
-- include_role:
+- name: Run tox with pdf build envlist
+  include_role:
     name: tox
   vars:
     tox_envlist: "{{ tox_pdf_envlist }}"
diff --git a/roles/configure-swap/tasks/main.yaml b/roles/configure-swap/tasks/main.yaml
index 7ad26394..fd2b8e5c 100644
--- a/roles/configure-swap/tasks/main.yaml
+++ b/roles/configure-swap/tasks/main.yaml
@@ -60,4 +60,5 @@
     value: 30
     state: present
 
-- debug:  var=ephemeral_device
+- name: Debug the ephemeral_device variable
+  debug: var=ephemeral_device
diff --git a/roles/configure-swap/tasks/root.yaml b/roles/configure-swap/tasks/root.yaml
index 894f2f66..a8e52b4b 100644
--- a/roles/configure-swap/tasks/root.yaml
+++ b/roles/configure-swap/tasks/root.yaml
@@ -15,7 +15,8 @@
       set_fact:
         root_filesystem: "{{ root_fs.stdout }}"
 
-    - debug: var=root_filesystem
+    - name: Debug the root_filesystem variable
+      debug: var=root_filesystem
 
 # Note, we don't use a sparse device to avoid wedging when disk space
 # and memory are both unavailable.
@@ -53,4 +54,5 @@
   become: yes
   command: swapon -a
 
-- debug: var=swap_required
+- name: Debug the swap_required variable
+  debug: var=swap_required
diff --git a/test-requirements.txt b/test-requirements.txt
index 3d8fe79b..19c0bea0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,9 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.0,<3.1.0 # Apache-2.0
+hacking>=4.0.0,<5.0.0 # Apache-2.0
 
 # ansible-lint requires ansible>=2.9
 ansible>=2.9.0,<2.10
-ansible-lint>=4.3.6,<=5
+ansible-lint>=5.0.0,<=6.0.0
 bashate>=0.2