Skip to content
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

Compatibility with Avocado #3295

Merged
merged 3 commits into from
Jan 19, 2022
Merged

Compatibility with Avocado #3295

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
791c4ee
Avocado compatility: bump minimum requirement to 82.x LTS
clebergnu Dec 8, 2021
e04e8c5
Cirrus CI: add tasks to check compatiblity with all Avocado branches
clebergnu Dec 8, 2021
7e32f08
Cirrus CI: do not require compatibility with latest Avocado
clebergnu Dec 8, 2021
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
44 changes: 38 additions & 6 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ fedora_34_task:
matrix:
# Get deps from setup.py (therefor pip version of avocado)
- AVOCADO_SRC:
# Latest LTS release is 82.x
# Older LTS release is 82.x
- AVOCADO_SRC: avocado-framework<83.0
# Latest Avocado from git
- AVOCADO_SRC: git+https://github.com/avocado-framework/avocado#egg=avocado_framework
# Latest LTS release is 92.x
- AVOCADO_SRC: avocado-framework<93.0
matrix:
- SETUP: setup.py develop --user
- SETUP: -m pip install .
- SETUP: -m pip install PYPI_UPLOAD/*.whl
matrix:
- VT_TYPE: qemu
- VT_TYPE: libvirt
build_script:
build_script: &build_scr
- (echo $SETUP | grep -v PYPI_UPLOAD) || make pypi
setup_script: &setup_scr
- python3 --version
Expand All @@ -47,12 +47,44 @@ centos_8_1_task:
image: quay.io/avocado-framework/avocado-vt-ci-centos-8.1
env:
matrix:
- AVOCADO_SRC:
- AVOCADO_SRC: avocado-framework<70.0
# Older LTS release is 82.x
- AVOCADO_SRC: avocado-framework<83.0
# Latest LTS release is 92.x
- AVOCADO_SRC: avocado-framework<93.0
matrix:
- SETUP: setup.py develop --user
- SETUP: -m pip install .
setup_script:
*setup_scr
bootstrap_script:
*bootstrap_scr
list_script:
*list_scr
dry_run_script:
*dry_run_scr

avocado_devel_task:
container:
image: quay.io/avocado-framework/avocado-vt-ci-fedora-34
Copy link
Contributor

Choose a reason for hiding this comment

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

do you mind using quay.io/avocado-framework/avocado-vt-ci-fedora-35 instead?
This image is already available in quay.

kvm: true
allow_failures: $AVOCADO_SRC == 'git+https://github.com/avocado-framework/avocado#egg=avocado_framework'
env:
matrix:
# Latest Avocado
- AVOCADO_SRC: git+https://github.com/avocado-framework/avocado#egg=avocado_framework
# 82lts tree (from where new 82.x releases will come)
- AVOCADO_SRC: git+https://github.com/avocado-framework/avocado@82lts#egg=avocado_framework
# 92lts tree (from where new 92.x releases will come)
- AVOCADO_SRC: git+https://github.com/avocado-framework/avocado@92lts#egg=avocado_framework
matrix:
- SETUP: setup.py develop --user
- SETUP: -m pip install .
- SETUP: -m pip install PYPI_UPLOAD/*.whl
matrix:
- VT_TYPE: qemu
- VT_TYPE: libvirt
build_script:
*build_scr
setup_script:
*setup_scr
bootstrap_script:
Expand Down
12 changes: 2 additions & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ def run(self):
shutil.rmtree(e)


def pre_post_plugin_type():
try:
from avocado.core.plugin_interfaces import JobPreTests as Pre
return 'avocado.plugins.result_events'
except ImportError:
return 'avocado.plugins.job.prepost'


if __name__ == "__main__":
setup(name='avocado-framework-plugin-vt',
version=VERSION,
Expand All @@ -77,7 +69,7 @@ def pre_post_plugin_type():
'vt-list-guests = avocado_vt.plugins.vt_list_guests:VTListGuests',
'vt-list-archs = avocado_vt.plugins.vt_list_archs:VTListArchs',
],
pre_post_plugin_type(): [
'avocado.plugins.result_events': [
'vt-joblock = avocado_vt.plugins.vt_joblock:VTJobLock',
],
'avocado.plugins.init': [
Expand All @@ -94,6 +86,6 @@ def pre_post_plugin_type():
],
},
install_requires=["netifaces", "simplejson", "six", "netaddr",
"aexpect", "avocado-framework>=68.0"],
"aexpect", "avocado-framework>=82.1"],
cmdclass={'clean': Clean},
)