From be04c72d1e839fe46628ba3945541b87981b32b3 Mon Sep 17 00:00:00 2001 From: rohitthakur2590 Date: Fri, 1 Dec 2023 17:08:53 +0530 Subject: [PATCH 1/3] [Major] Prepare release 4.0.0 Signed-off-by: rohitthakur2590 --- .ansible-lint | 8 +++++ .github/workflows/lint.yml | 14 ++++++++ .github/workflows/tests.yml | 54 +--------------------------- CHANGELOG.rst | 13 +++++++ changelogs/changelog.yaml | 46 +++++++++++++++--------- changelogs/fragments/lint_fixes.yaml | 3 -- galaxy.yml | 6 ++-- meta/runtime.yml | 2 +- 8 files changed, 69 insertions(+), 77 deletions(-) create mode 100644 .ansible-lint create mode 100644 .github/workflows/lint.yml delete mode 100644 changelogs/fragments/lint_fixes.yaml diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..4e6e3e6 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,8 @@ +--- +profile: production + +exclude_paths: + - changelogs/changelog.yaml +skip_list: + # this rule error out correct vars names for network validated content. + - var-naming[no-role-prefix] diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..e51cb9d --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,14 @@ +--- +name: ansible-lint +on: # yamllint disable-line rule:truthy + pull_request: + branches: ["main"] +jobs: + build: + name: Ansible Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Run ansible-lint + uses: ansible/ansible-lint@main + diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3f96d66..bbdb45e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,6 @@ on: # yamllint disable-line rule:truthy - cron: '0 0 * * *' jobs: - ansible-lint: - uses: ansible-network/github_actions/.github/workflows/ansible-lint.yml@main changelog: uses: ansible-network/github_actions/.github/workflows/changelog.yml@main if: github.event_name == 'pull_request' @@ -24,40 +22,10 @@ jobs: matrix_include: "[]" matrix_exclude: >- [ - { - "ansible-version": "stable-2.9" - }, - { - "ansible-version": "stable-2.12", - }, - { - "ansible-version": "stable-2.13", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.13", - "python-version": "3.11" - }, - { - "ansible-version": "stable-2.14", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.14", - "python-version": "3.8" - }, { "ansible-version": "stable-2.14", "python-version": "3.12" }, - { - "ansible-version": "stable-2.15", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.15", - "python-version": "3.8" - }, { "ansible-version": "stable-2.15", "python-version": "3.12" @@ -66,45 +34,25 @@ jobs: "ansible-version": "stable-2.16", "python-version": "3.9" }, - { - "ansible-version": "milestone", - "python-version": "3.7" - }, - { - "ansible-version": "milestone", - "python-version": "3.8" - }, { "ansible-version": "milestone", "python-version": "3.9" }, - { - "ansible-version": "devel", - "python-version": "3.7" - }, - { - "ansible-version": "devel", - "python-version": "3.8" - }, { "ansible-version": "devel", "python-version": "3.9" }, ] all_green: - if: ${{ always() && (github.event_name != 'schedule') }} + if: ${{ always() }} needs: - - ansible-lint - changelog - sanity runs-on: ubuntu-latest steps: - - run: >- - steps: - run: >- python -c "assert 'failure' not in set([ - '${{ needs.ansible-lint.result }}', '${{ needs.changelog.result }}', '${{ needs.sanity.result }}', ])" diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7e07856..f7c8dfb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,19 @@ Network Ospf Collection Release Notes .. contents:: Topics +v4.0.0 +====== + +Release Summary +--------------- + +Starting from this release, the minimum `ansible-core` version this collection requires is `2.14.0`. The last known version compatible with ansible-core<2.14 is `v3.0.0` + +Major Changes +------------- + +- Bumping `requires_ansible` to `>=2.14.0`, since previous ansible-core versions are EoL now. + v3.0.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index dfe15c5..cd054d9 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -3,35 +3,47 @@ releases: 1.0.0: changes: bugfixes: - - Fix when no neighbor is present. - - Update directory structure for filter plugin. + - Fix when no neighbor is present. + - Update directory structure for filter plugin. minor_changes: - - place remediate task in include dir. + - place remediate task in include dir. fragments: - - change_dir_structures.yaml - - move_remediate_to_includes.yaml - - trivial.yaml - - trivial_lint_fixes.yaml - - update_examples.yaml - - update_workflow.yaml + - change_dir_structures.yaml + - move_remediate_to_includes.yaml + - trivial.yaml + - trivial_lint_fixes.yaml + - update_examples.yaml + - update_workflow.yaml release_date: '2023-02-23' 2.0.0: changes: bugfixes: - - rename var in task. + - rename var in task. major_changes: - - Add support for scm operations and remove inventory_directory attribute. + - Add support for scm operations and remove inventory_directory attribute. fragments: - - fix_health_check_var_name.yaml - - scm_enablement_and_doc_changes.yaml + - fix_health_check_var_name.yaml + - scm_enablement_and_doc_changes.yaml release_date: '2023-05-11' 3.0.0: changes: doc_changes: - - Update docs, tests and GH matrix. + - Update docs, tests and GH matrix. major_changes: - - Change `actions` to `operations` + - Change `actions` to `operations` fragments: - - rename_actions_to_operations.yaml - - update_docs.yaml + - rename_actions_to_operations.yaml + - update_docs.yaml release_date: '2023-07-25' + 4.0.0: + changes: + major_changes: + - Bumping `requires_ansible` to `>=2.14.0`, since previous ansible-core versions + are EoL now. + release_summary: + Starting from this release, the minimum `ansible-core` version + this collection requires is `2.14.0`. The last known version compatible with + ansible-core<2.14 is `v3.0.0`. + fragments: + - lint_fixes.yaml + release_date: '2023-12-01' diff --git a/changelogs/fragments/lint_fixes.yaml b/changelogs/fragments/lint_fixes.yaml deleted file mode 100644 index 807ec4b..0000000 --- a/changelogs/fragments/lint_fixes.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -trivial: - - Fix ansible-lint reported failures. diff --git a/galaxy.yml b/galaxy.yml index 28655b1..f823b41 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,8 +2,8 @@ authors: - Rohit Thakur (rohitthakur2590) dependencies: - "ansible.netcommon": ">=5.1.1" - "ansible.utils": ">=2.9.0" + "ansible.netcommon": ">=6.0.0" + "ansible.utils": ">=3.0.0" license_file: LICENSE name: ospf description: Ansible Network OSPF enables user to manage the OSPF resources independent of platforms and perform OSPF health checks. @@ -12,4 +12,4 @@ readme: README.md repository: https://github.com/redhat-cop/network.ospf issues: https://github.com/redhat-cop/network.ospf/issues tags: [networking] -version: 3.0.0 +version: 4.0.0 diff --git a/meta/runtime.yml b/meta/runtime.yml index 6fe2c97..ce6befd 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,2 +1,2 @@ --- -requires_ansible: ">=2.13.0" +requires_ansible: ">=2.14.0" From e869aef566265a4d23ca304941d9d848b1321f62 Mon Sep 17 00:00:00 2001 From: rohitthakur2590 Date: Fri, 1 Dec 2023 17:29:20 +0530 Subject: [PATCH 2/3] fix lint issues Signed-off-by: rohitthakur2590 --- .github/workflows/lint.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e51cb9d..fbac38c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,4 +11,3 @@ jobs: - uses: actions/checkout@v4 - name: Run ansible-lint uses: ansible/ansible-lint@main - From 54862f5caf870bc4943d612bedbf8f21afcaee2a Mon Sep 17 00:00:00 2001 From: rohitthakur2590 Date: Fri, 1 Dec 2023 17:41:21 +0530 Subject: [PATCH 3/3] update core version Signed-off-by: rohitthakur2590 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 675cfaa..1e3b54d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The `network.ospf` enables users to manage the OSPF resources independent of pla ## Tested with Ansible -Tested with ansible-core 2.13 releases. +Tested with ansible-core 2.14 releases. ## Installation #### Install from Automation Hub