Merge remote-tracking branch 'clebergnu/compatibility_with_avocado'

Signed-off-by: Cleber Rosa <[email protected]>
avocado-framework · Jan 19, 2022 · e572b85 · e572b85
2 parents f8dacc4 + 7e32f08
commit e572b85
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 16 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -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
@@ -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
+    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:

diff --git a/setup.py b/setup.py
@@ -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,
@@ -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': [
@@ -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},
           )