Skip to content

Commit

Permalink
[ignore] Force Ansible v2.14+ and update pipeline versions
Browse files Browse the repository at this point in the history
  • Loading branch information
lhercot committed Jan 19, 2024
1 parent e513ea8 commit 8bb7138
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 31 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
# * is a special character in YAML so you have to quote this string
- cron: '0 8 * * *'
env:
python_version: 3.9
python_version: '3.10'
jobs:
build:
name: Build collection
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ansible: [v2.9.27, v2.10.17, v2.11.12, v2.12.10, stable-2.13, stable-2.14]
ansible: [v2.14.13, v2.15.8, v2.16.2, stable-2.16]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -65,8 +65,8 @@ jobs:
with:
python-version: ${{ env.python_version }}

- name: Install ansible-base (stable-2.14)
run: pip install https://github.com/ansible/ansible/archive/stable-2.14.tar.gz --disable-pip-version-check
- name: Install ansible-base (v2.15.8)
run: pip install https://github.com/ansible/ansible/archive/v2.15.8.tar.gz --disable-pip-version-check

- name: Download migrated collection artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ansible: [v2.9.27, v2.10.17, v2.11.12, v2.12.10, stable-2.13, stable-2.14]
ansible: [v2.14.13, v2.15.8, v2.16.2, stable-2.16]
steps:
- name: Set up Python ${{ env.python_version }}
uses: actions/setup-python@v4
Expand Down Expand Up @@ -149,11 +149,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ansible: [v2.10.17, v2.11.12, v2.12.10, stable-2.13, stable-2.14]
python-version: [3.9]
include:
- ansible: v2.9.27
python-version: 3.8
ansible: [v2.14.13, v2.15.8, v2.16.2, stable-2.16]
python-version: ['3.10']
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand Down Expand Up @@ -198,8 +195,8 @@ jobs:
with:
python-version: ${{ env.python_version }}

- name: Install ansible-base (stable-2.13)
run: pip install https://github.com/ansible/ansible/archive/stable-2.13.tar.gz --disable-pip-version-check
- name: Install ansible-base (v2.15.8)
run: pip install https://github.com/ansible/ansible/archive/v2.15.8.tar.gz --disable-pip-version-check

- name: Install coverage (v4.5.4)
run: pip install coverage==4.5.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/galaxy-importer.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[galaxy-importer]
LOG_LEVEL_MAIN = INFO
RUN_FLAKE8 = True
RUN_FLAKE8 = False
RUN_ANSIBLE_DOC = True
RUN_ANSIBLE_LINT = True
RUN_ANSIBLE_TEST = False
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Modules supporting new features introduced in ACI API in specific ACI versions m
*Note: This collection is not compatible with versions of Ansible before v2.8.*

## Requirements
Ansible v2.9 or newer
Ansible v2.14 or newer

## Install
Ansible must be installed
Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
requires_ansible: '>=2.9.10'
requires_ansible: '>=2.14.0'
action_groups:
all:
- aci_aaa_custom_privilege
Expand Down
13 changes: 0 additions & 13 deletions tests/unit/compat/builtins.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,3 @@
from __future__ import absolute_import, division, print_function

__metaclass__ = type

#
# Compat for python2.7
#

# One unittest needs to import builtins via __import__() so we need to have
# the string that represents it
try:
import __builtin__
except ImportError:
BUILTINS = "builtins"
else:
BUILTINS = "__builtin__"
2 changes: 1 addition & 1 deletion tests/unit/mock/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
class DictDataLoader(DataLoader):
def __init__(self, file_mapping=None):
file_mapping = {} if file_mapping is None else file_mapping
assert type(file_mapping) == dict
assert isinstance(file_mapping, dict)

super(DictDataLoader, self).__init__()

Expand Down
2 changes: 0 additions & 2 deletions tests/unit/module_utils/test_aci.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ def __init__(self):
try:
from lxml import etree

if sys.version_info >= (2, 7):
from xmljson import cobra
except ImportError:
pytestmark = pytest.mark.skip("ACI Ansible modules require the lxml and xmljson Python libraries")

Expand Down

0 comments on commit 8bb7138

Please sign in to comment.