From 2351c27339a05f6b6e74ebf3a003b852068a6c75 Mon Sep 17 00:00:00 2001 From: "softwarefactory-project-zuul[bot]" <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> Date: Tue, 8 Jul 2025 05:47:53 +0000 Subject: [PATCH 1/2] Merge pull request #650 from felixfontein/callback profile_* callbacks: avoid deprecated/deleted functions SUMMARY The profile_roles and profile_tasks callbacks define methods playbook_on_setup and playbook_on_stats which have been deleted/deprecated: playbook_on_stats has been deprecated, v2_playbook_on_stats should be used instead (that one has already been there for many years: ansible/ansible@ba0e532 was added in 2015). playbook_on_setup has been deleted (ansible/ansible@eec57ec), and its v2 variant was already deleted in 2017: ansible/ansible@59d5481 Ref: #635 ISSUE TYPE Bugfix Pull Request Feature Pull Request COMPONENT NAME profile_roles profile_tasks Reviewed-by: Abhijeet Kasurde Reviewed-by: Hideki Saito --- changelogs/fragments/650-profile_tasks_roles.yml | 2 ++ plugins/callback/profile_roles.py | 5 +---- plugins/callback/profile_tasks.py | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/650-profile_tasks_roles.yml diff --git a/changelogs/fragments/650-profile_tasks_roles.yml b/changelogs/fragments/650-profile_tasks_roles.yml new file mode 100644 index 0000000..d8664b8 --- /dev/null +++ b/changelogs/fragments/650-profile_tasks_roles.yml @@ -0,0 +1,2 @@ +minor_changes: + - "profile_tasks and profile_roles callback plugins - avoid deleted/deprecated callback functions, instead use modern interface that was introduced a longer time ago (https://github.com/ansible-collections/ansible.posix/issues/650)." diff --git a/plugins/callback/profile_roles.py b/plugins/callback/profile_roles.py index 270a74f..4d58014 100644 --- a/plugins/callback/profile_roles.py +++ b/plugins/callback/profile_roles.py @@ -124,10 +124,7 @@ class CallbackModule(CallbackBase): def v2_playbook_on_handler_task_start(self, task): self._record_task(task) - def playbook_on_setup(self): - self._display_tasktime() - - def playbook_on_stats(self, stats): + def v2_playbook_on_stats(self, stats): # Align summary report header with other callback plugin summary self._display.banner("ROLES RECAP") diff --git a/plugins/callback/profile_tasks.py b/plugins/callback/profile_tasks.py index c5cc5fe..c5857ca 100644 --- a/plugins/callback/profile_tasks.py +++ b/plugins/callback/profile_tasks.py @@ -189,10 +189,7 @@ class CallbackModule(CallbackBase): def v2_playbook_on_handler_task_start(self, task): self._record_task(task) - def playbook_on_setup(self): - self._display_tasktime() - - def playbook_on_stats(self, stats): + def v2_playbook_on_stats(self, stats): # Align summary report header with other callback plugin summary self._display.banner("TASKS RECAP") From a27063e1dc1e8f2c94ee47d92d458c41bb72f2ed Mon Sep 17 00:00:00 2001 From: "softwarefactory-project-zuul[bot]" <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> Date: Thu, 10 Jul 2025 01:00:47 +0000 Subject: [PATCH 2/2] Merge pull request #654 from saito-hideki/pr/bump_core_version_220 [CI] bump ansible-core version to 2.20 for devel branch SUMMARY Bump ansible-core version to 2.20 for devel branch. Bump devel test to ansible-core 2.19 Add ansible-core 2.18 to the stable list ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None --- .azure-pipelines/azure-pipelines.yml | 57 +++++++++++++++++-- .../fragments/654_ci_bump_core_version.yml | 3 + tests/sanity/ignore-2.20.txt | 1 + 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/654_ci_bump_core_version.yml create mode 100644 tests/sanity/ignore-2.20.txt diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 3e43100..4852f91 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -57,8 +57,23 @@ stages: test: units - name: Lint test: lint + - stage: Sanity_2_19 + displayName: Ansible 2.19 sanitay & Units & Lint + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: "{0}" + testFormat: 2.19/{0OI} + targets: + - name: Sanity + test: sanity + - name: Units + test: units + - name: Lint + test: lint - stage: Sanity_2_18 - displayName: Ansible 2.18 sanity + displayName: Ansible 2.18 sanity & Units & Lint dependsOn: [] jobs: - template: templates/matrix.yml @@ -73,10 +88,11 @@ stages: - name: Lint test: lint - stage: Sanity_2_17 - displayName: Ansible 2.17 sanity + displayName: Ansible 2.17 sanity & Units & Lint dependsOn: [] jobs: - template: templates/matrix.yml + I parameters: nameFormat: "{0}" testFormat: 2.17/{0} @@ -88,7 +104,7 @@ stages: - name: Lint test: lint - stage: Sanity_2_16 - displayName: Ansible 2.16 sanity + displayName: Ansible 2.16 sanity & Units & Lint dependsOn: [] jobs: - template: templates/matrix.yml @@ -101,7 +117,7 @@ stages: - name: Units test: units - stage: Sanity_2_15 - displayName: Ansible 2.15 sanity + displayName: Ansible 2.15 sanity & Units & Lint dependsOn: [] jobs: - template: templates/matrix.yml @@ -128,6 +144,20 @@ stages: test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 + - stage: Docker_2_19 + displayName: Docker 2.19 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/linux/{0}/1 + targets: + - name: Fedora 41 + test: fedora41 + - name: Ubuntu 22.04 + test: ubuntu2204 + - name: Ubuntu 24.04 + test: ubuntu2404 - stage: Docker_2_18 displayName: Docker 2.18 dependsOn: [] @@ -203,6 +233,22 @@ stages: test: freebsd/14.2 - name: FreeBSD 13.5 test: freebsd/13.5 + - stage: Remote_2_19 + displayName: Remote 2.19 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/{0}/1 + targets: + - name: RHEL 10.0 + test: rhel/10.0 + - name: RHEL 9.5 + test: rhel/9.5 + - name: FreeBSD 14.2 + test: freebsd/14.2 + - name: FreeBSD 13.5 + test: freebsd/13.5 - stage: Remote_2_18 displayName: Remote 2.18 dependsOn: [] @@ -272,6 +318,9 @@ stages: - Sanity_2_18 - Remote_2_18 - Docker_2_18 + - Sanity_2_19 + - Remote_2_19 + - Docker_2_19 - Sanity_devel - Remote_devel - Docker_devel diff --git a/changelogs/fragments/654_ci_bump_core_version.yml b/changelogs/fragments/654_ci_bump_core_version.yml new file mode 100644 index 0000000..d738204 --- /dev/null +++ b/changelogs/fragments/654_ci_bump_core_version.yml @@ -0,0 +1,3 @@ +~-- +trivial: + - Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI diff --git a/tests/sanity/ignore-2.20.txt b/tests/sanity/ignore-2.20.txt new file mode 100644 index 0000000..3cf68c0 --- /dev/null +++ b/tests/sanity/ignore-2.20.txt @@ -0,0 +1 @@ +tests/utils/shippable/timing.py shebang