Skip to content

Move vmtest into test/scripts/ #2278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzap merged 3 commits into from
Mar 31, 2026
Merged

Move vmtest into test/scripts/ #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fbfa8f
test: move vmtest into test/scripts/
achilleas-k Mar 23, 2026
4ad5ffc
github: use install-dependencies script everywhere
achilleas-k Mar 23, 2026
2a59e78
pyproject: update with path to module
achilleas-k Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
set-safe-directory: true

- name: Install python3
# The Fedora 41 container doesn't have python3 installed by default
# The Fedora container doesn't have python3 installed by default
run: dnf -y install python3

- name: Set up repository for pinned osbuild commit
Expand Down Expand Up @@ -223,18 +223,17 @@ jobs:
image: registry.fedoraproject.org/fedora:latest
steps:

- name: Install build and test dependencies
run: dnf -y install python3-pytest podman skopeo go btrfs-progs-devel device-mapper-devel gpgme-devel python3-pip

- name: Check out code into the Go module directory
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
set-safe-directory: true

- name: Install build and test dependencies
run: ./test/scripts/install-dependencies

- name: Testing imgtestlib and test scripts
run: |
pip install .
python3 -m pytest -v -k "not images_integration"

python-lint:
Expand All @@ -248,18 +247,19 @@ jobs:
image: registry.fedoraproject.org/fedora:latest
steps:

- name: Install build and test dependencies
run: dnf -y install python3-pylint git-core grep python3-pytest python3-pip

- name: Check out code into the Go module directory
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
set-safe-directory: true

- name: Install build and test dependencies
run: |
./test/scripts/install-dependencies
dnf -y install python3-pylint

- name: Analysing the code with pylint
run: |
pip install .
python3 -m pylint --version
python3 -m pylint $(grep -l "/usr/bin/env python3" -r test/scripts) test/scripts/*.py

Expand Down Expand Up @@ -305,16 +305,24 @@ jobs:
image: registry.fedoraproject.org/fedora:latest
options: "--privileged"
steps:
- name: Install build and test dependencies (without osbuild)
run: dnf -y install python3-pytest podman go btrfs-progs-devel device-mapper-devel gpgme-devel python3-pip qemu-system-s390x-core qemu-system-ppc64 qemu-user-static cloud-utils
- name: Check out code into the Go module directory
uses: actions/checkout@v6
with:
set-safe-directory: true

- name: Install python3
# The Fedora container doesn't have python3 installed by default
run: dnf -y install python3

- name: Setup repository for pinned osbuild commit
run: ./test/scripts/setup-osbuild-repo

- name: Install osbuild dependencies
run: dnf -y install osbuild osbuild-depsolve-dnf

- name: Install build and test dependencies
run: ./test/scripts/install-dependencies

- name: Manually start qemu-user-static
run: |
# mostly for debugging
Expand All @@ -326,7 +334,7 @@ jobs:
ls /proc/sys/fs/binfmt_misc/
sudo SYSTEMD_LOG_LEVEL=debug /usr/lib/systemd/systemd-binfmt /usr/lib/binfmt.d/qemu-*.conf
ls /proc/sys/fs/binfmt_misc/

- name: Cross arch integration test
run: |
pip install .
sudo -E pytest -rs -k ${{ matrix.arch }} -s -v ./test/test_cross_arch_integration.py
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ dependencies = [
]

[tool.setuptools.packages.find]
where = ["test/scripts"]
include = ["vmtest"]
11 changes: 4 additions & 7 deletions test/scripts/install-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dnf -y install \
go \
gpgme-devel \
krb5-devel \
lorax \
osbuild \
osbuild-depsolve-dnf \
osbuild-luks2 \
Expand All @@ -23,12 +24,8 @@ dnf -y install \
python3 \
python3-pip \
python3-pytest \
python3-boto3 \
python3-qemu-qmp \
python3-scp \
Copy link
Copy Markdown
Contributor

@lzap lzap Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird the deps are listed here.

yamllint \
xz

# for mkksiso
dnf install -y lorax

# we need this for the qemu boot tests and for any python tests but
# could skip it for other testing.
pip install .
0 vmtest/__init__.py → test/scripts/vmtest/__init__.py
View file
Open in desktop
File renamed without changes.
0 vmtest/test/test_ssh.py → test/scripts/vmtest/test/test_ssh.py
View file
Open in desktop
File renamed without changes.
0 vmtest/util.py → test/scripts/vmtest/util.py
View file
Open in desktop
File renamed without changes.
0 vmtest/util_test.py → test/scripts/vmtest/util_test.py
View file
Open in desktop
File renamed without changes.
0 vmtest/vm.py → test/scripts/vmtest/vm.py
View file
Open in desktop
File renamed without changes.
Loading