Fix various CI issues

Author: Alex-Welsh

.ansible-lint

@@ -6,3 +6,7 @@ skip_list:
   - galaxy[version-incorrect]
   - meta-runtime[unsupported-version]
   - fqcn[action-core]
+
+# Ensure dependent collections are not linted
+exclude_paths:
+  - .ansible/

.github/workflows/pull_request.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install ansible==5.* jmespath pulp-glue==0.21.*
+          pip install ansible==11.* jmespath pulp-glue==0.33.* pulp-glue-deb==0.3.*
           ansible-galaxy collection install git+file://$(pwd)
 
       - name: Run Pulp in one

README.md

@@ -7,12 +7,15 @@ Note: Pulp server installation is out of this collection's scope - for this purp
 
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9-2.10 releases.
+Tested with the current Ansible 11 release.
 
 ## Included content
 
 pulp_contentguard role
 pulp_repository role
+pulp_distribution role
+pulp_django_user role
+pulp_group role
 
 ## Using this collection
 

galaxy.yml

@@ -10,7 +10,7 @@ authors:
   - "Mark Goddard"
   - "Alex Welsh"
 dependencies:
-  "pulp.squeezer": ">=0.20.0"
+  "pulp.squeezer": "0.2.3"
 license:
   - "Apache-2.0"
 tags:

roles/pulp_container_content/tasks/process_content.yml

@@ -55,6 +55,7 @@
     - content_item.state | default('present') != 'present' or content_item.src_repo is defined
 
 - name: Resolve tags
+  when: ref_repo_version is defined
   block:
     - name: List tags from reference repository
       pulp.squeezer.api_call:
@@ -82,7 +83,6 @@
     - name: Set content units to process
       set_fact:
         content_units: "{{ tags_result.response.results | map(attribute='pulp_href') | list }}"
-  when: ref_repo_version is defined
 
 - name: Add content to repository
   pulp.squeezer.api_call:

tests/test_container_distribution.yml

@@ -65,14 +65,14 @@
           - dist_result.distribution.name == "test_container_distribution"
           - dist_result.distribution.base_path == "test_container_distribution"
           - dist_result.distribution.repository == repo_result.repository.pulp_href
-          - dist_result.distribution.repository_version is none
+          - dist_result.distribution.repository_version == ""
 
     - name: Verify distribution creation
       assert:
         that:
           - dist_version_1_result.distribution.name == "test_container_distribution_version_1"
           - dist_version_1_result.distribution.base_path == "test_container_distribution_version_1"
-          - dist_version_1_result.distribution.repository is none
+          - dist_version_1_result.distribution.repository == ""
           - dist_version_1_result.distribution.repository_version == repo_result.repository.latest_version_href
 
     - include_role:

tests/test_container_repository.yml

@@ -94,22 +94,22 @@
 
       rescue:
         - set_fact:
-            failed_task: "{{ ansible_failed_task }}"
+            failed_result: "{{ ansible_failed_result }}"
 
       always:
         - name: Assert that syncing from a URL that returns 404 fails
           assert:
             that:
-              - failed_task.name == "Sync container remotes into repositories"
+              - failed_result.msg is search("One or more items failed")
 
         - name: Assert that syncing from a URL that returns 404 is retried the correct number of times
           assert:
             that:
-              - pulp_repository_container_repos_sync.results[0].attempts == pulp_repository_container_repos_sync_retries
+              - failed_result.results[0].attempts == pulp_repository_container_repos_sync_retries
 
         - include_role:
             name: pulp_repository
           vars:
-            pulp_repository_deb_repos:
+            pulp_repository_container_repos:
               - name: test_container_repo_bad_url
                 state: absent

tests/test_content_guard_rbac.yml

@@ -23,8 +23,8 @@
     - name: Exit if version < 3.17
       meta: end_play
       vars:
-        query: "[?component=='core'].version"
-      when: status_result.json.versions | json_query(query) | first is version('3.17', '<')
+        query_string: "[?component=='core'].version"
+      when: status_result.json.versions | json_query(query_string) | first is version('3.17', '<')
 
     - name: Query groups
       uri:
@@ -84,31 +84,31 @@
 
     - name: Evaluate results for test-rbac_cg-1
       vars:
-        query: "[?name=='test-rbac_cg-1']"
+        query_string: "[?name=='test-rbac_cg-1']"
       assert:
         that:
-          - rbac_cg_list.json.results | json_query(query) | length == 1
-          - (rbac_cg_list.json.results | json_query(query) | first).name == 'test-rbac_cg-1'
-          - (rbac_cg_list.json.results | json_query(query) | first).groups | length == 2
-          - (rbac_cg_list.json.results | json_query(query) | first).groups[0].name in ['test_group1', 'test_group2']
-          - (rbac_cg_list.json.results | json_query(query) | first).groups[1].name in ['test_group1', 'test_group2']
+          - rbac_cg_list.json.results | json_query(query_string) | length == 1
+          - (rbac_cg_list.json.results | json_query(query_string) | first).name == 'test-rbac_cg-1'
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups | length == 2
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups[0].name in ['test_group1', 'test_group2']
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups[1].name in ['test_group1', 'test_group2']
           - >
-              (rbac_cg_list.json.results | json_query(query) | first).groups[0].name !=
-              (rbac_cg_list.json.results | json_query(query) | first).groups[1].name
+              (rbac_cg_list.json.results | json_query(query_string) | first).groups[0].name !=
+              (rbac_cg_list.json.results | json_query(query_string) | first).groups[1].name
 
     - name: Evaluate results for test-rbac_cg-2
       vars:
-        query: "[?name=='test-rbac_cg-2']"
+        query_string: "[?name=='test-rbac_cg-2']"
       assert:
         that:
-          - rbac_cg_list.json.results | json_query(query) | length == 1
-          - (rbac_cg_list.json.results | json_query(query) | first).name == 'test-rbac_cg-2'
-          - (rbac_cg_list.json.results | json_query(query) | first).groups | length == 2
-          - (rbac_cg_list.json.results | json_query(query) | first).groups[0].name in ['test_group1', 'test_group2']
-          - (rbac_cg_list.json.results | json_query(query) | first).groups[1].name in ['test_group1', 'test_group2']
+          - rbac_cg_list.json.results | json_query(query_string) | length == 1
+          - (rbac_cg_list.json.results | json_query(query_string) | first).name == 'test-rbac_cg-2'
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups | length == 2
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups[0].name in ['test_group1', 'test_group2']
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups[1].name in ['test_group1', 'test_group2']
           - >
-              (rbac_cg_list.json.results | json_query(query) | first).groups[0].name !=
-              (rbac_cg_list.json.results | json_query(query) | first).groups[1].name
+              (rbac_cg_list.json.results | json_query(query_string) | first).groups[0].name !=
+              (rbac_cg_list.json.results | json_query(query_string) | first).groups[1].name
 
     # update content guards
     - include_role:
@@ -136,21 +136,21 @@
 
     - name: Evaluate results for test-rbac_cg-1
       vars:
-        query: "[?name=='test-rbac_cg-1']"
+        query_string: "[?name=='test-rbac_cg-1']"
       assert:
         that:
-          - rbac_cg_list.json.results | json_query(query) | length == 1
-          - (rbac_cg_list.json.results | json_query(query) | first).name == 'test-rbac_cg-1'
-          - (rbac_cg_list.json.results | json_query(query) | first).groups | length == 1
-          - (rbac_cg_list.json.results | json_query(query) | first).groups[0].name == 'test_group1'
+          - rbac_cg_list.json.results | json_query(query_string) | length == 1
+          - (rbac_cg_list.json.results | json_query(query_string) | first).name == 'test-rbac_cg-1'
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups | length == 1
+          - (rbac_cg_list.json.results | json_query(query_string) | first).groups[0].name == 'test_group1'
 
 
     - name: Evaluate results for test-rbac_cg-2
       vars:
-        query: "[?name=='test-rbac_cg-2']"
+        query_string: "[?name=='test-rbac_cg-2']"
       assert:
         that:
-          - rbac_cg_list.json.results | json_query(query) | length == 0
+          - rbac_cg_list.json.results | json_query(query_string) | length == 0
 
     - name: Cleanup
       include_role:

tests/test_group.yml

@@ -21,8 +21,8 @@
     - name: Exit if version < 3.17
       meta: end_play
       vars:
-        query: "[?component=='core'].version"
-      when: status_result.json.versions | json_query(query) | first is version('3.17', '<')
+        query_string: "[?component=='core'].version"
+      when: status_result.json.versions | json_query(query_string) | first is version('3.17', '<')
 
     - name: Query groups
       uri:

tests/test_user.yml

@@ -22,8 +22,8 @@
     - name: Exit if version < 3.17
       meta: end_play
       vars:
-        query: "[?component=='core'].version"
-      when: status_result.json.versions | json_query(query) | first is version('3.17', '<')
+        query_string: "[?component=='core'].version"
+      when: status_result.json.versions | json_query(query_string) | first is version('3.17', '<')
 
     - name: Query groups
       uri: