Skip to content

Commit bd5df2d

Browse files
authored
fix: workflow (#192)
* fix: removed unsupported ansible versions and added new required python versions * fix: check if quoting python version works * fix: quote all python versions * fix: deprecated features + remove python 3.12 + coverage version * fix: dependencies * fix: pin coverage dependency to 6.5.0
1 parent 513f566 commit bd5df2d

File tree

16 files changed

+45
-37
lines changed

16 files changed

+45
-37
lines changed

.github/workflows/ansible-test.yml

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
- name: Check out code
1919
uses: actions/checkout@v2
2020

21-
- name: Set up Python 3.9
21+
- name: Set up Python 3.10
2222
uses: actions/setup-python@v1
2323
with:
24-
python-version: 3.9
24+
python-version: '3.10'
2525

2626
- name: Install ansible (${{ matrix.ansible-version }})
2727
run: pip install pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
@@ -48,19 +48,19 @@ jobs:
4848
strategy:
4949
fail-fast: false
5050
matrix:
51-
python-version: [3.8, 3.9]
52-
ansible-version: [stable-2.9, stable-2.10, stable-2.11, stable-2.12, stable-2.13, devel]
51+
python-version: ['3.8', '3.9', '3.10', '3.11']
52+
ansible-version: [stable-2.13, stable-2.14, stable-2.15, devel]
5353
exclude:
5454
- ansible-version: devel
55-
python-version: 2.7
55+
python-version: '3.8'
5656
- ansible-version: devel
57-
python-version: 3.8
58-
- ansible-version: stable-2.12
59-
python-version: 2.7
57+
python-version: '3.9'
58+
- ansible-version: stable-2.15
59+
python-version: '3.8'
60+
- ansible-version: stable-2.14
61+
python-version: '3.8'
6062
- ansible-version: stable-2.13
61-
python-version: 2.7
62-
- ansible-version: stable-2.9
63-
python-version: 3.9
63+
python-version: '3.11'
6464

6565
steps:
6666
- name: Set up Python ${{ matrix.python-version }}
@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Generate coverage report
9393
run: |
94-
if [ "${{ matrix.ansible-version }}" == "devel" ]; then pip install coverage==6.5.0; fi
94+
if [ "${{ matrix.ansible-version }}" == "stable-2.13" ]; then pip install coverage==4.5.4; fi
9595
ansible-test coverage xml -v --group-by command --group-by version
9696
working-directory: /home/runner/.ansible/collections/ansible_collections/infoblox/nios_modules/
9797

@@ -108,21 +108,29 @@ jobs:
108108
strategy:
109109
fail-fast: false
110110
matrix:
111-
python-version: [3.8, 3.9]
112-
ansible-version: [stable-2.9, stable-2.10, stable-2.11, stable-2.12, stable-2.13, devel]
111+
python-version: ['3.8', '3.9', '3.10', '3.11']
112+
ansible-version: [stable-2.13, stable-2.14, stable-2.15, devel]
113113
exclude:
114-
- ansible-version: stable-2.9
115-
python-version: 3.9
114+
- ansible-version: devel
115+
python-version: '3.8'
116+
- ansible-version: devel
117+
python-version: '3.9'
118+
- ansible-version: stable-2.15
119+
python-version: '3.8'
120+
- ansible-version: stable-2.14
121+
python-version: '3.8'
122+
- ansible-version: stable-2.13
123+
python-version: '3.11'
116124
steps:
117-
- name: Set up Python 3.9
125+
- name: Set up Python ${{ matrix.python-version }}
118126
uses: actions/setup-python@v1
119127
with:
120-
python-version: 3.9
128+
python-version: ${{ matrix.python-version }}
121129

122130
- name: Check out code
123131
uses: actions/checkout@v2
124132

125-
- name: Install ansible-base (${{ matrix.ansible }})
133+
- name: Install ansible-base (${{ matrix.ansible-version }})
126134
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
127135

128136
- name: Download migrated collection artifacts
@@ -170,15 +178,15 @@ jobs:
170178
strategy:
171179
fail-fast: false
172180
matrix:
173-
ansible-version: [stable-2.9, stable-2.10, stable-2.11, stable-2.12, stable-2.13, devel]
181+
ansible-version: [stable-2.13, stable-2.14, stable-2.15, devel]
174182

175183
steps:
176-
- name: Set up Python 3.9
184+
- name: Set up Python 3.10
177185
uses: actions/setup-python@v1
178186
with:
179187
# it is just required to run that once as "ansible-test sanity" in the docker image
180188
# will run on all python versions it supports.
181-
python-version: 3.9
189+
python-version: '3.10'
182190

183191
- name: Install ansible (${{ matrix.ansible-version }}) version
184192
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_a_record_idempotence.yml
1+
- include_tasks: nios_a_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_aaaa_record_idempotence.yml
1+
- include_tasks: nios_aaaa_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_cname_record_idempotence.yml
1+
- include_tasks: nios_cname_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_dns_view_idempotence.yml
1+
- include_tasks: nios_dns_view_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_host_record_idempotence.yml
1+
- include_tasks: nios_host_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_mx_record_idempotence.yml
1+
- include_tasks: nios_mx_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_naptr_record_idempotence.yml
1+
- include_tasks: nios_naptr_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_network_idempotence.yml
1+
- include_tasks: nios_network_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_network_view_idempotence.yml
1+
- include_tasks: nios_network_view_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_ptr_record_idempotence.yml
1+
- include_tasks: nios_ptr_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_srv_record_idempotence.yml
1+
- include_tasks: nios_srv_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_txt_record_idempotence.yml
1+
- include_tasks: nios_txt_record_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: nios_zone_idempotence.yml
1+
- include_tasks: nios_zone_idempotence.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- include: prepare_nios_tests_idempotence.yml
1+
- include_tasks: prepare_nios_tests_idempotence.yml

tests/unit/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ pytest-xdist
55
mock
66
pytest-mock
77
pytest-cov
8-
coverage==4.5.4
8+
coverage==6.5.0

0 commit comments

Comments
 (0)