Merge pull request #5844 from clebergnu/103_lts_pre_release_misc

Signed-off-by: Jan Richter <jarichte@redhat.com>

avocado/utils/vmimage.py

@@ -212,7 +212,7 @@ def get_image_url(self):
         else:
             cloud = "CloudImages"
 
-        if self.url_old_images and int(self.version) <= 35:
+        if self.url_old_images and int(self.version) <= 36:
             self.url_versions = self.url_old_images
 
         self.url_images = self.url_versions + "{version}/" + cloud + "/{arch}/images/"

docs/source/misc/index.rst

@@ -49,15 +49,6 @@ It uses Avocado in its `ftest
 <https://github.com/daos-stack/daos/blob/master/src/tests/ftest/avocado_tests.py>`__
 test suite.
 
-Falco
-~~~~~
-
-`Falco <https://falco.org/>`__, the cloud-native runtime security
-project, is the de facto Kubernetes threat detection engine.
-
-It uses Avocado in its `regression test suite
-<https://github.com/falcosecurity/falco/tree/master/test#falco-regression-tests>`__.
-
 RUDDER
 ~~~~~~
 

docs/source/quickstart/index.rst

@@ -245,10 +245,6 @@ Build and Quality Status
    :target: https://copr.fedorainfracloud.org/coprs/g/avocado/avocado-latest/package/python-avocado/
    :alt: Copr build
 
-.. image:: https://api.cirrus-ci.com/github/avocado-framework/avocado.svg
-   :target: https://cirrus-ci.com/github/avocado-framework/avocado
-   :alt: Basic checks on Cirrus CI
-
 .. image:: https://api.codeclimate.com/v1/badges/03f506164e1d19f95480/maintainability
    :target: https://codeclimate.com/github/avocado-framework/avocado/maintainability
    :alt: Code Climate Maintainability

examples/testplans/release/pre.json

@@ -7,9 +7,6 @@
         {"name": "Check status of master branch",
          "description": "Navigate to:\n\n   https://github.com/avocado-framework/avocado#build-and-quality-status\n\nand make sure that all build and quality services report good indicators"},
 
-        {"name": "Set the readthedocs.org token and check it",
-        "description": "Generate and export the content of a token (from https://readthedocs.org/accounts/tokens/) as the AVOCADO_READTHEDOCS_TOKEN environment variable. For this step you have to be admin of avocado-framework project on readthedocs.org: Run locally selftests/pre_release/tests/readthedocs.py and make sure it is passing."},
-
         {"name": "Run GitHub Action 'Pre-release tests'",
          "description": "Run the GitHub Action 'Pre-release tests' on the master branch at https://github.com/avocado-framework/avocado/actions/workflows/prerelease.yml and check all the tests pass. Make at least a quick visual check to the logs."},
 

selftests/pre_release/jobs/pre_release.py

@@ -9,10 +9,6 @@
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(THIS_DIR)))
 TESTS_DIR = os.path.join(os.path.dirname(THIS_DIR), "tests")
 
-cirrus_ci = {
-    "resolver.references": [os.path.join(TESTS_DIR, "cirrusci.py")],
-}
-
 parallel_1 = {
     "resolver.references": [
         os.path.join("selftests", "unit"),
@@ -31,6 +27,6 @@
 if __name__ == "__main__":
     os.chdir(ROOT_DIR)
     config = {"job.output.testlogs.statuses": ["FAIL", "ERROR", "INTERRUPT"]}
-    with Job.from_config(config, [cirrus_ci, parallel_1, vmimage]) as j:
+    with Job.from_config(config, [parallel_1, vmimage]) as j:
         os.environ["AVOCADO_CHECK_LEVEL"] = "3"
         sys.exit(j.run())

selftests/pre_release/tests/vmimage.py.data/variants.yml

@@ -50,12 +50,14 @@ distro: !mux
     !filter-out : /run/architectures/ppc
     !filter-out : /run/architectures/ppc64
     version: !mux
-      34:
-        version: 34
-      35:
-        version: 35
       36:
         version: 36
+      37:
+        version: 37
+      38:
+        version: 38
+      39:
+        version: 39
   ubuntu:
     name: ubuntu
     !filter-out : /run/architectures/arm