openstack/bifrost
Code Issues Proposed changes

Merge "Test 2 major ansible versions"

Browse Source
This commit is contained in:
Zuul 2024-08-13 00:31:58 +00:00 committed by Gerrit Code Review
commit 1c95336154
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/ansible9-26b181a8ca5716cf.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Start testing and supporting Ansible 9.x in parallel with Ansible 8.x

8
scripts/env-setup.sh
View File

@ -5,8 +5,12 @@ set -euo pipefail
. $(dirname $0)/install-deps.sh . $(dirname $0)/install-deps.sh
# NOTE(pas-ha) the above exports some useful variables like # NOTE(pas-ha) the above exports some useful variables like
# $PYTHON , $PIP and $VENV depending on venv install or not # $PYTHON , $PIP and $VENV depending on venv install or not
source /etc/os-release
DEFAULT_PIP_ANSIBLE='>=8,<9' if [[ $ID == "centos" ]] || [[ $VERSION_CODENAME == "bullseye" ]]; then
DEFAULT_PIP_ANSIBLE='>=8,<9'
elif [[ $ID == "ubuntu" ]] || [[ $VERSION_CODENAME == "bookworm" ]] ; then
DEFAULT_PIP_ANSIBLE='>=9,<10'
fi
ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml} ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml}
ANSIBLE_COLLECTION_SOURCE_PATH= ANSIBLE_COLLECTION_SOURCE_PATH=

4
tox.ini
View File

@ -79,8 +79,8 @@ filename = *.py
[testenv:linters] [testenv:linters]
allowlist_externals = bash allowlist_externals = bash
deps = deps =
ansible>=8,<9 ansible>=9,<10
ansible-lint>=6,<7 ansible-lint>=24,<25
commands = commands =
bash tools/ansible-lint.sh bash tools/ansible-lint.sh