Skip to content

Commit e77f6dc

Browse files
committed
ci: ansible-lint requires dependencies to be installed [citest_skip]
ansible-lint requires the dependencies in meta/collection-requirements.yml and tests/collection-requirements.yml to be installed. tox-lsr 3.18.1 will ensure they are installed. Refactor the tests somewhat so that the collection and test steps are separate. Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 7b01423 commit e77f6dc

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.github/workflows/ansible-lint.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,20 @@ jobs:
4444
- name: Install tox, tox-lsr
4545
run: |
4646
set -euxo pipefail
47-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.0"
47+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.1"
4848
4949
- name: Set up Python
5050
uses: actions/setup-python@v6
5151
with:
5252
python-version: ${{ matrix.versions.python }}
5353

54-
- name: Convert role to collection format and run ansible-lint
54+
- name: Convert role to collection format
55+
run: tox -e collection
56+
57+
- name: Run ansible-lint
5558
run: |
5659
set -euxo pipefail
5760
LSR_ANSIBLE_LINT_DEP="ansible-lint==${{ matrix.versions.ansible_lint }}" \
5861
LSR_ANSIBLE_LINT_ANSIBLE_DEP="ansible-core==${{ matrix.versions.ansible }}" \
5962
tox -x testenv:ansible-lint-collection.basepython="python${{ matrix.versions.python }}" \
60-
-e collection,ansible-lint-collection
63+
-e ansible-lint-collection

.github/workflows/ansible-managed-var-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install tox, tox-lsr
3434
run: |
3535
set -euxo pipefail
36-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.1"
3737
3838
- name: Run ansible-plugin-scan
3939
run: |

.github/workflows/ansible-test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,18 @@ jobs:
4747
- name: Install tox, tox-lsr
4848
run: |
4949
set -euxo pipefail
50-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.0"
50+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.1"
5151
5252
- name: Set up Python
5353
uses: actions/setup-python@v6
5454
with:
5555
python-version: ${{ matrix.versions.python }}
5656

57-
- name: Convert role to collection format and run ansible-test
57+
- name: Convert role to collection format
58+
run: tox -e collection
59+
60+
- name: Run ansible-test
5861
run: |
5962
tox \
6063
-x testenv:ansible-test-${{ matrix.versions.ansible }}.basepython="python${{ matrix.versions.python }}" \
61-
-e collection,ansible-test-${{ matrix.versions.ansible }}
64+
-e ansible-test-${{ matrix.versions.ansible }}

.github/workflows/qemu-kvm-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
python3 -m pip install --upgrade pip
111111
sudo apt update
112112
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86
113-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.0"
113+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.18.1"
114114
115115
# HACK: Drop this when moving this workflow to 26.04 LTS
116116
- name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5

0 commit comments

Comments
 (0)