From f22858dea9a6913b2f5a547fb6523b3e764e4dad Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Wed, 29 Jan 2025 14:57:59 -0800 Subject: [PATCH 1/5] Reduce minimal Ansible version to >=2.15.0 --- meta/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/runtime.yml b/meta/runtime.yml index 0f2f2a5..e496772 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,5 +1,5 @@ --- -requires_ansible: ">=2.16.0" +requires_ansible: ">=2.15.0" action_groups: gcp: From 529d21630acec9dcc00451090654de451c01d8e8 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Wed, 29 Jan 2025 15:32:12 -0800 Subject: [PATCH 2/5] Run integration tests against 2.16 --- .github/workflows/ansible-integration-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ansible-integration-tests.yml b/.github/workflows/ansible-integration-tests.yml index 990354e..8ff37f8 100644 --- a/.github/workflows/ansible-integration-tests.yml +++ b/.github/workflows/ansible-integration-tests.yml @@ -25,6 +25,7 @@ jobs: # and test against the minimum version of Python supported by both. If/when we change # the integration tests to support parallelism we can revisit. ansible_version: + - stable-2.16 - stable-2.17 - stable-2.18 steps: @@ -35,7 +36,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.11' # this is the minimum version required for Ansible 2.17 + python-version: '3.10' # this is the minimum version required for Ansible 2.16 - name: Install dependencies run: pip install -r requirements.txt - name: Install ansible-base (${{ matrix.ansible_version }}) @@ -70,4 +71,4 @@ jobs: # run tests - name: Run integration tests # Add the -vvv flag to print out more output - run: ansible-test integration -v --color --python 3.11 --venv-system-site-packages + run: ansible-test integration -v --color --python 3.10 --venv-system-site-packages From e6c49c0f69c0fa981e58c5fce64c5d632b06196e Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Thu, 30 Jan 2025 11:34:10 -0800 Subject: [PATCH 3/5] Settle on 2.16.0 --- meta/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/runtime.yml b/meta/runtime.yml index e496772..0f2f2a5 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,5 +1,5 @@ --- -requires_ansible: ">=2.15.0" +requires_ansible: ">=2.16.0" action_groups: gcp: From ad6df1688f6b5003df5f96a5ff1aa74755e30ad8 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Thu, 30 Jan 2025 13:53:56 -0800 Subject: [PATCH 4/5] Add release note fragment --- changelogs/fragments/667-include-2-16-in-ci.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/667-include-2-16-in-ci.yml diff --git a/changelogs/fragments/667-include-2-16-in-ci.yml b/changelogs/fragments/667-include-2-16-in-ci.yml new file mode 100644 index 0000000..a2a945b --- /dev/null +++ b/changelogs/fragments/667-include-2-16-in-ci.yml @@ -0,0 +1,2 @@ +bugfixes: + - run integration test with Ansible 2.16 to match `requires_ansible` version \ No newline at end of file From 7c808c047cb79ad9c94bd026b5a26a3fed481013 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Thu, 30 Jan 2025 13:57:06 -0800 Subject: [PATCH 5/5] Update version --- CHANGELOG.rst | 8 ++++++++ changelogs/changelog.yaml | 7 +++++++ changelogs/fragments/667-include-2-16-in-ci.yml | 2 -- galaxy.yml | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) delete mode 100644 changelogs/fragments/667-include-2-16-in-ci.yml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 99681e3..8cafaf9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,14 @@ Google.Cloud Release Notes .. contents:: Topics +v1.5.1 +====== + +Bugfixes +-------- + +- run integration test with Ansible 2.16 to match `requires_ansible` version + v1.5.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 9ce4438..1d30245 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -121,3 +121,10 @@ releases: - remove-google_cloud_ops_agents-role.yml - upgrade_anisble.yml release_date: '2025-01-14' + 1.5.1: + changes: + bugfixes: + - run integration test with Ansible 2.16 to match `requires_ansible` version + fragments: + - 667-include-2-16-in-ci.yml + release_date: '2025-01-30' diff --git a/changelogs/fragments/667-include-2-16-in-ci.yml b/changelogs/fragments/667-include-2-16-in-ci.yml deleted file mode 100644 index a2a945b..0000000 --- a/changelogs/fragments/667-include-2-16-in-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: - - run integration test with Ansible 2.16 to match `requires_ansible` version \ No newline at end of file diff --git a/galaxy.yml b/galaxy.yml index f015ca3..024b507 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ namespace: google name: cloud # The version of the collection. Must be compatible with semantic versioning -version: 1.5.0 +version: 1.5.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md