1. Patchew
  2. Libvirt
  3. [PATCH 0/3] ci: Fixes for integration jobs
  4. View patch

[PATCH 2/3] ci: Move upstream-qemu job to Fedora 39

Andrea Bolognani posted 3 patches 1 year ago
[PATCH 2/3] ci: Move upstream-qemu job to Fedora 39
Posted by Andrea Bolognani 1 year ago 
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 ci/integration.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/ci/integration.yml b/ci/integration.yml
index c234696d10..ff1bb5d81d 100644
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -121,47 +121,47 @@ fedora-38-tests-local-env:
       artifacts: true
 
 
-.fedora-38-upstream-qemu-tests:
+.fedora-39-tests:
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-38
+    DISTRO: fedora-39
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-38-upstream-qemu-tests-prebuilt-env:
+fedora-39-tests-prebuilt-env:
   extends:
-    - .integration_tests_upstream_qemu_prebuilt_env
-    - .fedora-38-upstream-qemu-tests
+    - .integration_tests_prebuilt_env
+    - .fedora-39-tests
   needs:
-    - x86_64-fedora-38-prebuilt-env
+    - x86_64-fedora-39-prebuilt-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-38-prebuilt-env
+      job: x86_64-fedora-39-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-38-prebuilt-env
+      job: x86_64-fedora-39-prebuilt-env
       ref: master
       artifacts: true
 
-fedora-38-upstream-qemu-tests-local-env:
+fedora-39-tests-local-env:
   extends:
-    - .integration_tests_upstream_qemu_local_env
-    - .fedora-38-upstream-qemu-tests
+    - .integration_tests_local_env
+    - .fedora-39-tests
   needs:
-    - x86_64-fedora-38-local-env
+    - x86_64-fedora-39-local-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-38-prebuilt-env
+      job: x86_64-fedora-39-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-38-prebuilt-env
+      job: x86_64-fedora-39-prebuilt-env
       ref: master
       artifacts: true
 
 
-.fedora-39-tests:
+.fedora-39-upstream-qemu-tests:
   variables:
     # needed by libvirt-gitlab-executor
     DISTRO: fedora-39
@@ -170,10 +170,10 @@ fedora-38-upstream-qemu-tests-local-env:
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-39-tests-prebuilt-env:
+fedora-39-upstream-qemu-tests-prebuilt-env:
   extends:
-    - .integration_tests_prebuilt_env
-    - .fedora-39-tests
+    - .integration_tests_upstream_qemu_prebuilt_env
+    - .fedora-39-upstream-qemu-tests
   needs:
     - x86_64-fedora-39-prebuilt-env
     - project: libvirt/libvirt-perl
@@ -185,10 +185,10 @@ fedora-39-tests-prebuilt-env:
       ref: master
       artifacts: true
 
-fedora-39-tests-local-env:
+fedora-39-upstream-qemu-tests-local-env:
   extends:
-    - .integration_tests_local_env
-    - .fedora-39-tests
+    - .integration_tests_upstream_qemu_local_env
+    - .fedora-39-upstream-qemu-tests
   needs:
     - x86_64-fedora-39-local-env
     - project: libvirt/libvirt-perl
-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [PATCH 2/3] ci: Move upstream-qemu job to Fedora 39
Posted by Peter Krempa 1 year ago 
On Mon, Jan 08, 2024 at 11:43:23 +0100, Andrea Bolognani wrote:
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  ci/integration.yml | 42 +++++++++++++++++++++---------------------
>  1 file changed, 21 insertions(+), 21 deletions(-)

Reordering the entries made this very unpleasant to review. 

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: Re: [PATCH 2/3] ci: Move upstream-qemu job to Fedora 39
Posted by Andrea Bolognani 1 year ago 
On Mon, Jan 08, 2024 at 09:11:12PM +0100, Peter Krempa wrote:
> On Mon, Jan 08, 2024 at 11:43:23 +0100, Andrea Bolognani wrote:
> > Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> > ---
> >  ci/integration.yml | 42 +++++++++++++++++++++---------------------
> >  1 file changed, 21 insertions(+), 21 deletions(-)
>
> Reordering the entries made this very unpleasant to review.

Agreed. I don't know how to make it better though. Is there a way to
convince git to not try quite as hard to reuse existing lines? The
alternative would be to have two patches, one that drops the Fedora
38 job and one that adds the Fedora 39 one.

-- 
Andrea Bolognani / Red Hat / Virtualization
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: Re: [PATCH 2/3] ci: Move upstream-qemu job to Fedora 39
Posted by Peter Krempa 1 year ago 
On Tue, Jan 09, 2024 at 00:44:45 -0800, Andrea Bolognani wrote:
> On Mon, Jan 08, 2024 at 09:11:12PM +0100, Peter Krempa wrote:
> > On Mon, Jan 08, 2024 at 11:43:23 +0100, Andrea Bolognani wrote:
> > > Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> > > ---
> > >  ci/integration.yml | 42 +++++++++++++++++++++---------------------
> > >  1 file changed, 21 insertions(+), 21 deletions(-)
> >
> > Reordering the entries made this very unpleasant to review.
> 
> Agreed. I don't know how to make it better though. Is there a way to
> convince git to not try quite as hard to reuse existing lines? The
> alternative would be to have two patches, one that drops the Fedora
> 38 job and one that adds the Fedora 39 one.

The job seems to have failed:

https://gitlab.com/libvirt/libvirt/-/jobs/5915956009

It looks like qemu and everything built properly but the failure is
rather opaque:

/tmp/script.: line 188: ci/jobs.sh: No such file or directory
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: Re: Re: [PATCH 2/3] ci: Move upstream-qemu job to Fedora 39
Posted by Andrea Bolognani 1 year ago 
On Fri, Jan 12, 2024 at 09:30:12AM +0100, Peter Krempa wrote:
> On Tue, Jan 09, 2024 at 00:44:45 -0800, Andrea Bolognani wrote:
> > On Mon, Jan 08, 2024 at 09:11:12PM +0100, Peter Krempa wrote:
> > > On Mon, Jan 08, 2024 at 11:43:23 +0100, Andrea Bolognani wrote:
> > > > Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> > > > ---
> > > >  ci/integration.yml | 42 +++++++++++++++++++++---------------------
> > > >  1 file changed, 21 insertions(+), 21 deletions(-)
>
> The job seems to have failed:
>
> https://gitlab.com/libvirt/libvirt/-/jobs/5915956009
>
> It looks like qemu and everything built properly but the failure is
> rather opaque:
>
> /tmp/script.: line 188: ci/jobs.sh: No such file or directory

Completely untested fix:

  https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/JMSSRRDXIAIABUEKJ7UO3VIU5RSVCCAW/

-- 
Andrea Bolognani / Red Hat / Virtualization
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.