From 678508d115d94a24d51a00eb77af790f6df1a58e Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 31 Oct 2024 11:45:51 -0400 Subject: [PATCH 1/2] Revert job template to standard async --- roles/controller_job_templates/tasks/main.yml | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/roles/controller_job_templates/tasks/main.yml b/roles/controller_job_templates/tasks/main.yml index f7a1e649b..d0be80d6a 100644 --- a/roles/controller_job_templates/tasks/main.yml +++ b/roles/controller_job_templates/tasks/main.yml @@ -83,22 +83,20 @@ error_flag: true when: ansible_check_mode and __job_templates_job_async.failed is defined and __job_templates_job_async.failed -- name: "Managing Controller Job Templates | include async file" - ansible.builtin.include_tasks: "{{ role_path }}/tasks/async.yml" +- name: "Managing Job Templates | Wait for finish the Job Templates management" + ansible.builtin.async_status: + jid: "{{ __job_templates_job_async_result_item.ansible_job_id }}" + register: __job_templates_job_async_result + until: __job_templates_job_async_result.finished + retries: "{{ controller_configuration_job_templates_async_retries }}" + delay: "{{ controller_configuration_job_templates_async_delay }}" loop: "{{ __job_templates_job_async.results }}" loop_control: loop_var: __job_templates_job_async_result_item - label: "{{ __operation.verb }} Controller Job Template {{ __job_templates_job_async_result_item.__controller_template_item.name }} | Wait for finish the job templates {{ __operation.action }}" + label: "{{ __operation.verb }} Job Template {{ __job_templates_job_async_result_item }} | Wait for finish the Job Template {{ __operation.action }}" when: not ansible_check_mode and __job_templates_job_async_result_item.ansible_job_id is defined no_log: "{{ controller_configuration_job_templates_secure_logging }}" vars: - __operation: "{{ operation_translate[__job_templates_job_asycn_result_item.__controller_template_item.state | default(platform_state) | default('present')] }}" + __operation: "{{ operation_translate[__job_templates_job_async_result_item.__controller_template_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' - -- name: Set Job Templates error artifact - when: __templates_error_list is defined - ansible.builtin.set_stats: - data: - job_templates_errors: "{{ __templates_error_list }}" - register: __job_templates_errors_set_stats ... From 7c1c237e7f870dc9b8103dbba624c76d8d0c94f2 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 31 Oct 2024 14:27:04 -0400 Subject: [PATCH 2/2] update release and release fragment --- .github/workflows/release.yml | 2 -- changelogs/fragments/Rewrite.yml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 465f8aff0..d9d791e96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,8 +10,6 @@ on: jobs: release: - needs: - - ci_standalone uses: "redhat-cop/ansible_collections_tooling/.github/workflows/release_pipeline_dual.yml@main" with: # Galaxy Publish diff --git a/changelogs/fragments/Rewrite.yml b/changelogs/fragments/Rewrite.yml index 585530960..8afaf451f 100644 --- a/changelogs/fragments/Rewrite.yml +++ b/changelogs/fragments/Rewrite.yml @@ -1,6 +1,7 @@ --- release_summary: | | Release Date: 2024-10-31 + | The collection has been updated for AAP 2.5 use and has only been tested against AAP 2.5, it has been updated to include the previously separated hub, eda, and gateway collection roles. | `Conversion Guide `__ breaking_changes: - Major overhaul to all code completed, variables have changed, role names have changed, please see the Conversion guide for more details.