Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 2.0.0 release #206

Merged
merged 2 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 17 additions & 46 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ jobs:
ansible:
# It's important that Sanity is tested against all stable-X.Y branches
# Testing against `devel` may fail as new tests are added.
- stable-2.9
- stable-2.10
- stable-2.11
- stable-2.12
- stable-2.13
- stable-2.14
- stable-2.15
- stable-2.16
- stable-2.17
Expand Down Expand Up @@ -84,48 +78,27 @@ jobs:
python_version:
- ''
include:
# 2.9
- ansible: stable-2.9
docker_container: ubuntu1604
sops_version: 3.5.0
- ansible: stable-2.9
docker_container: ubuntu1804
sops_version: 3.7.1
# 2.10
- ansible: stable-2.10
docker_container: ubuntu1804
sops_version: 3.6.0
# 2.11
- ansible: stable-2.11
docker_container: ubuntu1804
sops_version: 3.7.2
# 2.12
- ansible: stable-2.12
docker_container: ubuntu2004
sops_version: 3.7.0
# 2.13
- ansible: stable-2.13
docker_container: ubuntu2004
sops_version: 3.7.3
# 2.14
- ansible: stable-2.14
docker_container: ubuntu2204
sops_version: 3.7.3
# 2.15
- ansible: stable-2.15
docker_container: ubuntu2004
sops_version: 3.5.0
- ansible: stable-2.15
docker_container: ubuntu2204
sops_version: 3.7.3
sops_version: 3.6.0
# 2.16
- ansible: stable-2.16
docker_container: ubuntu2004
sops_version: 3.7.0
- ansible: stable-2.16
docker_container: ubuntu2204
sops_version: 3.8.0
sops_version: 3.7.3
# 2.17
- ansible: stable-2.17
docker_container: ubuntu2204
sops_version: 3.8.1
sops_version: 3.8.0
- ansible: stable-2.17
docker_container: fedora39
sops_version: 3.9.0
sops_version: 3.8.1
# 2.18
- ansible: stable-2.18
docker_container: ubuntu2404
Expand Down Expand Up @@ -170,11 +143,12 @@ jobs:
integration-continue-on-error: 'false'
integration-diff: 'false'
integration-retry-on-error: 'true'
# NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
# Adjust vars files so that sops ${{ matrix.sops_version }} is used
pre-test-cmd: |-
echo 'override_sops_version: ${{ matrix.sops_version }}' > tests/integration/integration_config.yml
echo 'github_token: ${{ secrets.GITHUB_TOKEN }}' >> tests/integration/integration_config.yml
git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general
test-deps: >-
git+https://github.com/ansible-collections/community.general.git,${{ matrix.ansible == 'stable-2.9' && 'stable-4' || 'main' }}
testing-type: integration
target-python-version: ${{ matrix.python_version }}
target: gha/main/
Expand All @@ -201,7 +175,7 @@ jobs:
- ''
target:
- gha/install/
pre-test-cmd:
test-deps:
- ''
github_latest_detection:
- ''
Expand Down Expand Up @@ -236,9 +210,7 @@ jobs:
python_version: '3.12'
target: gha/install/3/
github_latest_detection: auto
# NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
pre-test-cmd: |-
git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general
test-deps: git+https://github.com/ansible-collections/community.general.git,main
- ansible: devel
docker_container: quay.io/ansible-community/test-image:debian-bookworm
python_version: '3.11'
Expand Down Expand Up @@ -269,9 +241,7 @@ jobs:
# python_version: ''
# target: gha/install/3/
# github_latest_detection: auto
# # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
# pre-test-cmd: |-
# git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general
# test-deps: git+https://github.com/ansible-collections/community.general.git,main
steps:
- name: >-
Perform sops installation integration testing against
Expand All @@ -291,5 +261,6 @@ jobs:
echo 'github_latest_detection: ${{ matrix.github_latest_detection || 'auto' }}' >> tests/integration/integration_config.yml
${{ matrix.pre-test-cmd || 'echo' }}
testing-type: integration
test-deps: ${{ matrix.test-deps }}
target-python-version: ${{ matrix.python_version }}
target: ${{ matrix.target }}
21 changes: 0 additions & 21 deletions .github/workflows/ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,6 @@ jobs:
base_image: quay.io/rockylinux/rockylinux:9
pre_base: '"#"'
execute_playbook: ansible-playbook -v community.sops.install_localhost
- name: ansible-core 2.14 @ CentOS Stream 9
ansible_core: https://github.com/ansible/ansible/archive/stable-2.14.tar.gz
ansible_runner: ansible-runner
base_image: quay.io/centos/centos:stream9
pre_base: '"#"'
execute_playbook: ansible-playbook -v community.sops.install_localhost
- name: ansible-core 2.13 @ RHEL UBI 8
ansible_core: https://github.com/ansible/ansible/archive/stable-2.13.tar.gz
ansible_runner: ansible-runner
other_deps: |2
python_interpreter:
package_system: python39 python39-pip python39-wheel python39-cryptography
base_image: docker.io/redhat/ubi8:latest
pre_base: '"#"'
execute_playbook: ansible-playbook -v community.sops.install_localhost
- name: ansible-core 2.12 @ Fedora 38
ansible_core: https://github.com/ansible/ansible/archive/stable-2.12.tar.gz
ansible_runner: ansible-runner
base_image: registry.fedoraproject.org/fedora:38
pre_base: '"#"'
execute_playbook: ansible-playbook -v community.sops.install_localhost
runs-on: ubuntu-latest
steps:
- name: Check out code
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ For more information about communication, see the [Ansible communication guide](

## Tested with Ansible

Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, and ansible-core 2.18 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.

The vars plugin requires ansible-base 2.10 or later.
Tested with the current ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, and ansible-core 2.18 releases and the current development version of ansible-core. Ansible versions before 2.15.0 are not supported.

## External requirements

Expand Down
5 changes: 5 additions & 0 deletions changelogs/fragments/2.0.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
release_summary: Major verison that drops support for End of Life Ansible/ansible-base/ansible-core versions.
removed_features:
- "The collection no longer supports Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, and ansible-core 2.14.
If you need to continue using End of Life versions of Ansible/ansible-base/ansible-core, please use community.sops 1.x.y
(https://github.com/ansible-collections/community.sops/pull/206)."
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace: community
name: sops
version: 1.9.1
version: 2.0.0
readme: README.md
authors:
- Edoardo Tenani
Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
# SPDX-License-Identifier: GPL-3.0-or-later

requires_ansible: '>=2.9.10'
requires_ansible: '>=2.15.0'
14 changes: 1 addition & 13 deletions plugins/filter/_latest_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,7 @@
type: string
'''

from ansible.module_utils.six import raise_from

try:
from ansible.module_utils.compat.version import LooseVersion
except ImportError:
try:
from distutils.version import LooseVersion
except ImportError as exc:
msg = (
'To use this plugin or module with ansible-core 2.11, ansible-base 2.10,'
' or Ansible 2.9, you need to use Python < 3.12 with distutils.version present'
)
raise_from(ImportError(msg), exc)
from ansible.module_utils.compat.version import LooseVersion


def pick_latest_version(version_list):
Expand Down
Loading
Loading