On Tue, Mar 25, 2025 at 09:00:22PM +0100, Thomas Huth wrote: > From: Thomas Huth <th...@redhat.com> > > Since we don't run the Avocado jobs in the CI anymore, rename > these variables to QEMU_JOB_FUNCTIONAL and QEMU_CI_FUNCTIONAL_TESTING. > > Also, there was a mismatch between the documentation and the > implementation of QEMU_CI_AVOCADO_TESTING: While the documentation > said that you had to "Set this variable to have the tests using the > Avocado framework run automatically", you indeed needed to set it > to make the pipelines appear in your dashboard - but they were never > run automatically in forks and had to be triggered manually. Let's > improve this now: No need to hide these pipelines from the users > by default anymore (the functional tests should be stable enough > nowadays), and rather allow the users to run the pipelines auto- > matically with this switch now instead, as was documented. > > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > docs/devel/testing/ci-jobs.rst.inc | 19 +++++++++---------- > .gitlab-ci.d/base.yml | 8 ++------ > .gitlab-ci.d/buildtest-template.yml | 2 +- > 3 files changed, 12 insertions(+), 17 deletions(-) > > diff --git a/docs/devel/testing/ci-jobs.rst.inc > b/docs/devel/testing/ci-jobs.rst.inc > index 3756bbe3554..4f4c96dd883 100644 > --- a/docs/devel/testing/ci-jobs.rst.inc > +++ b/docs/devel/testing/ci-jobs.rst.inc > @@ -126,10 +126,10 @@ QEMU_JOB_PUBLISH > The job is for publishing content after a branch has been > merged into the upstream default branch. > > -QEMU_JOB_AVOCADO > -~~~~~~~~~~~~~~~~ > +QEMU_JOB_FUNCTIONAL > +~~~~~~~~~~~~~~~~~~~ > > -The job runs the Avocado integration test suite > +The job runs the functional test suite > > Contributor controlled runtime variables > ---------------------------------------- > @@ -149,13 +149,12 @@ the jobs to be manually started from the UI > Set this variable to 2 to create the pipelines and run all > the jobs immediately, as was the historical behaviour > > -QEMU_CI_AVOCADO_TESTING > -~~~~~~~~~~~~~~~~~~~~~~~ > -By default, tests using the Avocado framework are not run automatically in > -the pipelines (because multiple artifacts have to be downloaded, and if > -these artifacts are not already cached, downloading them make the jobs > -reach the timeout limit). Set this variable to have the tests using the > -Avocado framework run automatically. > +QEMU_CI_FUNCTIONAL_TESTING
Both old and new terms are quite verbose, how about dropping '_TESTING' suffix ? With, or without that rename though: Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|