Skip to content

Commit 841fc66

Browse files
committed
ci: tox-lsr 3.16.0 - fix qemu tox test failures - rename to qemu-ansible-core-X-Y [citest_skip]
the latest version of tox 4.49 has a strange issue - it thinks that a tox testenv like `[qemu-ansible-core-2.20]` is specifying python 2.20 which conflicts with the testenv basepython of python 3.latest. There appears to be no way to workaround this. So, rename all of the testenvs to use `major-minor` instead of `major.minor` e.g. `[qemu-ansible-core-2-20]` Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 59e6760 commit 841fc66

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

.github/workflows/ansible-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install tox, tox-lsr
3636
run: |
3737
set -euxo pipefail
38-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.15.0"
38+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
3939
4040
- name: Convert role to collection format
4141
id: 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.15.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
3737
3838
- name: Run ansible-plugin-scan
3939
run: |

.github/workflows/ansible-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install tox, tox-lsr
3737
run: |
3838
set -euxo pipefail
39-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.15.0"
39+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
4040
4141
- name: Convert role to collection format
4242
run: |

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@ jobs:
2828
matrix:
2929
scenario:
3030
# QEMU
31-
- { image: "centos-9", env: "qemu-ansible-core-2.16" }
32-
- { image: "centos-10", env: "qemu-ansible-core-2.17" }
33-
- { image: "fedora-42", env: "qemu-ansible-core-2.19" }
34-
- { image: "fedora-43", env: "qemu-ansible-core-2.19" }
35-
- { image: "leap-15.6", env: "qemu-ansible-core-2.18" }
31+
- { image: "centos-9", env: "qemu-ansible-core-2-16" }
32+
- { image: "centos-10", env: "qemu-ansible-core-2-17" }
33+
- { image: "fedora-42", env: "qemu-ansible-core-2-19" }
34+
- { image: "fedora-43", env: "qemu-ansible-core-2-19" }
35+
- { image: "leap-15.6", env: "qemu-ansible-core-2-18" }
3636

3737
# container
38-
- { image: "centos-9", env: "container-ansible-core-2.16" }
39-
- { image: "centos-9-bootc", env: "container-ansible-core-2.16" }
38+
- { image: "centos-9", env: "container-ansible-core-2-16" }
39+
- { image: "centos-9-bootc", env: "container-ansible-core-2-16" }
4040
# broken on non-running dbus
41-
# - { image: "centos-10", env: "container-ansible-core-2.17" }
42-
- { image: "centos-10-bootc", env: "container-ansible-core-2.17" }
43-
- { image: "fedora-42", env: "container-ansible-core-2.17" }
44-
- { image: "fedora-43", env: "container-ansible-core-2.19" }
45-
- { image: "fedora-42-bootc", env: "container-ansible-core-2.17" }
46-
- { image: "fedora-43-bootc", env: "container-ansible-core-2.19" }
41+
# - { image: "centos-10", env: "container-ansible-core-2-17" }
42+
- { image: "centos-10-bootc", env: "container-ansible-core-2-17" }
43+
- { image: "fedora-42", env: "container-ansible-core-2-17" }
44+
- { image: "fedora-43", env: "container-ansible-core-2-19" }
45+
- { image: "fedora-42-bootc", env: "container-ansible-core-2-17" }
46+
- { image: "fedora-43-bootc", env: "container-ansible-core-2-19" }
4747

4848
env:
4949
TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi"
@@ -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.15.0"
113+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
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

contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The latest version of tox-lsr supports qemu testing.
5454
you can use e.g.
5555

5656
```bash
57-
tox -e qemu-ansible-core-2.14 -- --image-name centos-9 tests/tests_default.yml
57+
tox -e qemu-ansible-core-2-20 -- --image-name centos-9 tests/tests_default.yml
5858
```
5959

6060
There are many command line options and environment variables which can be used

0 commit comments

Comments
 (0)