On Fri, Jan 19, 2024 at 10:44:56AM +0000, Daniel P. Berrangé wrote:
On Fri, Jan 19, 2024 at 11:31:19AM +0100, Peter Krempa wrote:
> The latest lcitool merged the 'prebuilt-env' and 'local-env' jobs
into
> one which use variables to pick up the right environment and steps
> rather than duplicating everything.
>
> Regenerate the generated job definitions, fix the helper definitions
> and also fix the manually defined jobs (website-job).
>
> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
> ---
> .gitlab-ci.yml | 68 +---
> ci/gitlab/build-templates.yml | 118 +++---
> ci/gitlab/builds.yml | 696 +++++++---------------------------
> ci/integration-template.yml | 30 +-
> ci/integration.yml | 147 ++-----
> 5 files changed, 253 insertions(+), 806 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
Aside from whitespace/ordering differences this was essentially the
same as what I had tested with.
This requires synchronized merging with the perl & python changes
https://gitlab.com/libvirt/libvirt-perl/-/merge_requests/112
https://gitlab.com/libvirt/libvirt-python/-/merge_requests/134
to support the integration tests.
These two are merged, so once their pipelines have finished on
master, this is good to merge too.
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 :|